diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-06 22:06:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 22:06:53 +0000 |
| commit | 00182a94542f14c9a8639efd77241cd4a2a5b047 (patch) | |
| tree | 7b37028d7504a28bb0cc645a9bf14b7865b2d5c6 | |
| parent | 803e1bbc8baa74b3e41230e3cec68b65e1e636f2 (diff) | |
| parent | 7fc6e55f24336781e5bbfe47e0f1ed8608dde395 (diff) | |
| download | external_protobuf-00182a94542f14c9a8639efd77241cd4a2a5b047.zip external_protobuf-00182a94542f14c9a8639efd77241cd4a2a5b047.tar.gz external_protobuf-00182a94542f14c9a8639efd77241cd4a2a5b047.tar.bz2 | |
am 7fc6e55f: am f2982dd2: Merge "Include libc++ statically in aprotoc."
* commit '7fc6e55f24336781e5bbfe47e0f1ed8608dde395':
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) |