Add libprotobuf-cpp-2.3.0-lite

Added android/config.h which will be used to configure
android builds of libraries. Currently I've undef HAVE_HASH_MAP
and HAVE_HASH_SET as the versions in stlport generated compile
errors.

Updated .gitignore to be more selective on what it ignores so
android/config.h wouldn't be ignored.

Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
pull/91/head
Wink Saville 15 years ago
parent ce7a2b0149
commit acf8ef12d0
  1. 57
      Android.mk

@ -15,10 +15,63 @@
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
# Java micro library
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := com.google.protobuf.micro
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
include $(BUILD_STATIC_JAVA_LIBRARY)
# C++ lite library
# =======================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := \
src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \
src/google/protobuf/stubs/hash.cc \
src/google/protobuf/stubs/hash.h \
src/google/protobuf/stubs/map-util.h \
src/google/protobuf/stubs/stl_util-inl.h \
src/google/protobuf/extension_set.cc \
src/google/protobuf/generated_message_util.cc \
src/google/protobuf/message_lite.cc \
src/google/protobuf/repeated_field.cc \
src/google/protobuf/wire_format_lite.cc \
src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/coded_stream_inl.h \
src/google/protobuf/io/zero_copy_stream.cc \
src/google/protobuf/io/zero_copy_stream_impl_lite.cc
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/android \
bionic \
external/stlport/stlport \
$(LOCAL_PATH)/src
LOCAL_SHARED_LIBRARIES := \
libcutils libutils libstlport
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
# src/google/protobuf/stubs/once.h \
# src/google/protobuf/stubs/common.h \
# src/google/protobuf/io/coded_stream.h \
# src/google/protobuf/generated_message_util.h \
# src/google/protobuf/repeated_field.h \
# src/google/protobuf/extension_set.h \
# src/google/protobuf/wire_format_lite_inl.h
#
#LOCAL_COPY_HEADERS_TO := $(LOCAL_MODULE)
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
include $(BUILD_STATIC_LIBRARY)

Loading…
Cancel
Save