summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-02-06 21:48:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-06 21:48:19 +0000
commitf2982dd208b744cde5dd54dcd4b4c53f47f03712 (patch)
tree31a9eed95dd9a036b9621a4093e5cf77378c0fa9
parent1c2c4706c4995122bb1271618511b27e84a9326a (diff)
parent7b93f287c2bce7520f2a80d7c059415d31221f2a (diff)
downloadexternal_protobuf-f2982dd208b744cde5dd54dcd4b4c53f47f03712.zip
external_protobuf-f2982dd208b744cde5dd54dcd4b4c53f47f03712.tar.gz
external_protobuf-f2982dd208b744cde5dd54dcd4b4c53f47f03712.tar.bz2
Merge "Include libc++ statically in aprotoc."
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 609d5a3..1e093f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -407,6 +407,10 @@ LOCAL_MODULE := aprotoc
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
+# Build aprotoc as a standalone binary because we copy it to
+# unbundled projects where libc++.so may not be available.
+LOCAL_CXX_STL := libc++_static
+
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := $(COMPILER_SRC_FILES)