commit 5ec5537033ad371b1046f2db455ad27fa082176f
author Yabin Cui <yabinc@google.com> Fri Aug 12 18:07:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 18:07:06 2016 +0000
tree 39438bfff09ae909794f1d061a019df67ef84b4d
parent 5b009a8d3658b1e2374f2b2a730d42d50b2db898
parent 48b07ad0a7d451a1a12e021b09ec15db58172e81

Support building lite static libraries on host and platform.
am: 48b07ad0a7

Change-Id: I84b1f6e4d9d164320f0167f36c8922f260d119b6

Android.mk

diff --git a/Android.mk b/Android.mk
index 89ccd2c..1fd50c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -320,6 +320,18 @@
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libprotobuf-cpp-lite
+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)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+include $(BUILD_STATIC_LIBRARY)
+
 # C++ lite library for the host.
 # =======================================================
 include $(CLEAR_VARS)
@@ -334,6 +346,19 @@
 
 include $(BUILD_HOST_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libprotobuf-cpp-lite
+LOCAL_MODULE_HOST_OS := darwin linux windows
+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)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+include $(BUILD_HOST_STATIC_LIBRARY)
+
 # C++ lite library + rtti (libc++ flavored for the platform)
 # =======================================================
 include $(CLEAR_VARS)
@@ -463,7 +488,6 @@
 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)
@@ -483,7 +507,6 @@
 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)
@@ -503,7 +526,6 @@
 LOCAL_SRC_FILES := $(protobuf_cc_full_src_files)
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/android \
-    external/zlib \
     $(LOCAL_PATH)/src
 
 LOCAL_RTTI_FLAG := -frtti
@@ -524,7 +546,6 @@
 LOCAL_SRC_FILES := $(protobuf_cc_full_src_files)
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/android \
-    external/zlib \
     $(LOCAL_PATH)/src
 
 LOCAL_RTTI_FLAG := -frtti