Support building lite static libraries on host and platform.
It is to support using protobuf in simpleperf.
Bug: 28114205
(cherry picked from commit 63d886b7d36c61b22b5fea2fb4877c4904ba3601)
Change-Id: Ife40267283c0dca58ca2b2899a0b77211ba81baf
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