Merge "Build libprotobuf-cpp-lite for the host."
diff --git a/Android.mk b/Android.mk
index 355866f..e88aba2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -308,6 +308,26 @@
include $(BUILD_SHARED_LIBRARY)
+# C++ lite library for the host.
+# =======================================================
+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_HOST_SHARED_LIBRARY)
+
# C++ lite library + rtti (libc++ flavored for the platform)
# =======================================================
include $(CLEAR_VARS)
@@ -330,6 +350,28 @@
include $(BUILD_SHARED_LIBRARY)
+# C++ lite library + rtti (libc++ flavored for the host)
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-lite-rtti
+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_RTTI_FLAG := -frtti
+LOCAL_CFLAGS := $(IGNORED_WARNINGS)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+
+include $(BUILD_HOST_SHARED_LIBRARY)
+
# C++ full library
# =======================================================
protobuf_cc_full_src_files := \