diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 11:03:23 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-11 11:03:23 -0800 |
| commit | 0c44a2d48095860ad077ab6ef82468900eb1171d (patch) | |
| tree | dd775c746772fe8a7a47a8875c17f83527a718f6 /Android.mk | |
| parent | 123e5376117dece4db60c4f28fd77f03a9ba4acb (diff) | |
| download | external_protobuf-0c44a2d48095860ad077ab6ef82468900eb1171d.zip external_protobuf-0c44a2d48095860ad077ab6ef82468900eb1171d.tar.gz external_protobuf-0c44a2d48095860ad077ab6ef82468900eb1171d.tar.bz2 | |
Add platform versions of the protobuf libraries.
NDK libraries should not be linked in to platform code, so create a
separate version for the platform that is linked against libc++
instead of the NDK STLs.
Bug: 15193147
Change-Id: I3935e5dd3bd99676772a4b9681e275ef3601b855
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 37 |
1 files changed, 37 insertions, 0 deletions
@@ -243,6 +243,25 @@ LOCAL_NDK_STL_VARIANT := stlport_static include $(BUILD_STATIC_LIBRARY) +# C++ lite library (libc++ flavored for the platform) +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := libprotobuf-cpp-lite +LOCAL_MODULE_TAGS := optional + +LOCAL_CPP_EXTENSION := .cc + +LOCAL_SRC_FILES := $(CC_LITE_SRC_FILES) + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/android \ + $(LOCAL_PATH)/src + +LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS) + +include $(BUILD_SHARED_LIBRARY) + # C++ full library # ======================================================= protobuf_cc_full_src_files := \ @@ -328,6 +347,24 @@ LOCAL_NDK_STL_VARIANT := gnustl_static include $(BUILD_STATIC_LIBRARY) +# C++ full library - libc++ version for the platform +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := libprotobuf-cpp-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 \ + $(LOCAL_PATH)/src + +LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI $(IGNORED_WARNINGS) +LOCAL_SHARED_LIBRARIES := libz + +include $(BUILD_SHARED_LIBRARY) + # Clean temp vars protobuf_cc_full_src_files := |