aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarie Janssen <jamuraa@google.com>2016-02-05 01:35:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-02-05 01:35:04 +0000
commit68879d8c1cd2efe823bd6af4077090ee99b6d614 (patch)
tree4fff10be075e2e37ab2a4272a81a28c3545704f9
parent5a5fd5d133377f4fe2c2df50e999f0cf9cd2add4 (diff)
parentfcbf587bd0b203c64aa5996c31d81af3c1d2b44c (diff)
downloadprotobuf-brillo-m10-release.tar.gz
Merge "Build libprotobuf-cpp-full for the host"brillo-m10-releasebrillo-m10-dev
-rw-r--r--Android.mk41
1 files changed, 41 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 216b96a98..d7e868ab6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -450,6 +450,47 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
include $(BUILD_SHARED_LIBRARY)
+# C++ full library for the host
+# =======================================================
+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-host
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+# C++ full library + rtti for the host.
+# =======================================================
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-full-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_RTTI_FLAG := -frtti
+LOCAL_CFLAGS := $(IGNORED_WARNINGS)
+LOCAL_SHARED_LIBRARIES := libz-host
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src
+
+include $(BUILD_HOST_SHARED_LIBRARY)
+
# Clean temp vars
protobuf_cc_full_src_files :=