diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-06 22:01:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 22:01:20 +0000 |
| commit | 7fc6e55f24336781e5bbfe47e0f1ed8608dde395 (patch) | |
| tree | 31a9eed95dd9a036b9621a4093e5cf77378c0fa9 | |
| parent | bb2b6d9bb01780ba28a0b9c42758468929a6c002 (diff) | |
| parent | f2982dd208b744cde5dd54dcd4b4c53f47f03712 (diff) | |
| download | external_protobuf-7fc6e55f24336781e5bbfe47e0f1ed8608dde395.zip external_protobuf-7fc6e55f24336781e5bbfe47e0f1ed8608dde395.tar.gz external_protobuf-7fc6e55f24336781e5bbfe47e0f1ed8608dde395.tar.bz2 | |
am f2982dd2: Merge "Include libc++ statically in aprotoc."
* commit 'f2982dd208b744cde5dd54dcd4b4c53f47f03712':
Include libc++ statically in aprotoc.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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) |