diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2012-11-06 14:42:21 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2012-11-08 17:26:05 +0000 |
| commit | a939d667261041b51bfa2cc746d0f6c3b6a66207 (patch) | |
| tree | d4e9a2a6ec5b3b7177a9ea9e6ef585993ad18a20 /Android.mk | |
| parent | 082bf44e4b6c03be4970d461912d1d74adbb4cff (diff) | |
| download | external_protobuf-a939d667261041b51bfa2cc746d0f6c3b6a66207.zip external_protobuf-a939d667261041b51bfa2cc746d0f6c3b6a66207.tar.gz external_protobuf-a939d667261041b51bfa2cc746d0f6c3b6a66207.tar.bz2 | |
Add gnustl+rtti version of cpp full library
Adding new version of cpp library,
'libprotobuf-cpp-2.3.0-full-gnustl-rtti'. Previously, c++ code
compiled against gnustl couldn't link with this library - having
both gnustl and stlport in same binary leads to nasty conflicts.
Bug: 7484202
Change-Id: Ic4fbbfc2839c4ce88bf605cf3d9cca47b146f965
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 40 |
1 files changed, 32 insertions, 8 deletions
@@ -209,14 +209,7 @@ include $(BUILD_STATIC_LIBRARY) # C++ full library # ======================================================= -include $(CLEAR_VARS) - -LOCAL_MODULE := libprotobuf-cpp-2.3.0-full -LOCAL_MODULE_TAGS := optional - -LOCAL_CPP_EXTENSION := .cc - -LOCAL_SRC_FILES := \ +protobuf_cc_full_src_files := \ $(CC_LITE_SRC_FILES) \ src/google/protobuf/stubs/strutil.cc \ src/google/protobuf/stubs/strutil.h \ @@ -242,6 +235,14 @@ LOCAL_SRC_FILES := \ src/google/protobuf/compiler/importer.cc \ src/google/protobuf/compiler/parser.cc +# C++ full library - stlport version +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := libprotobuf-cpp-2.3.0-full +LOCAL_MODULE_TAGS := optional +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES := $(protobuf_cc_full_src_files) LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/android \ external/zlib \ @@ -272,6 +273,29 @@ LOCAL_NDK_STL_VARIANT := stlport_static include $(BUILD_STATIC_LIBRARY) +# C++ full library - Gnustl+rtti version +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := libprotobuf-cpp-2.3.0-full-gnustl-rtti +LOCAL_MODULE_TAGS := optional +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES := $(protobuf_cc_full_src_files) +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/android \ + external/zlib \ + $(LOCAL_PATH)/src + +LOCAL_CFLAGS := -frtti +LOCAL_SDK_VERSION := 14 +LOCAL_NDK_STL_VARIANT := gnustl_static + +include $(BUILD_STATIC_LIBRARY) + +# Clean temp vars +protobuf_cc_full_src_files := + + # Android Protocol buffer compiler, aprotoc (host executable) # used by the build systems as $(PROTOC) defined in # build/core/config.mk |