diff options
| author | Alex Deymo <deymo@google.com> | 2015-12-09 11:09:54 -0800 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2015-12-09 11:15:43 -0800 |
| commit | 4026c6867fa5df7a9acd9299b6d67ca2b0223d43 (patch) | |
| tree | f38d28704bf554c92d4e48689251bd11b82b0bd0 | |
| parent | dea517e990189ca652c980dc89ab4ff645a96bdd (diff) | |
| download | protobuf-4026c6867fa5df7a9acd9299b6d67ca2b0223d43.tar.gz | |
Build libprotobuf-cpp-lite for the host.
This patch builds libprotobuf-cpp-lite with and without rtti for the
host, using the same module names than when building for the target.
These libraries are automatically included by the build system when
generating C++ headers from a .proto file, so having the same name makes
that work for the host binaries as well.
Bug: 24619596
TEST=mma on linux and mac
Change-Id: I3af27bbbea3ab5ca1a418add3da1d03c4e1a63e5
| -rw-r--r-- | Android.mk | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 355866f12..e88aba274 100644 --- a/Android.mk +++ b/Android.mk @@ -308,6 +308,26 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src 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 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src 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 := \ |