diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-06 23:35:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 23:35:25 +0000 |
| commit | 6d2137875b5cf20938d68939de7aff254dc9fa22 (patch) | |
| tree | 7cb41e2927bf6151487125919f32f3d211bd57cc | |
| parent | 7fc6e55f24336781e5bbfe47e0f1ed8608dde395 (diff) | |
| parent | eb5ae9e258a8fc953e6cf0b3a0dd04a112a05a3c (diff) | |
| download | external_protobuf-6d2137875b5cf20938d68939de7aff254dc9fa22.zip external_protobuf-6d2137875b5cf20938d68939de7aff254dc9fa22.tar.gz external_protobuf-6d2137875b5cf20938d68939de7aff254dc9fa22.tar.bz2 | |
am eb5ae9e2: Merge "Use libstdc++, not libc++_static, with protobuf."
* commit 'eb5ae9e258a8fc953e6cf0b3a0dd04a112a05a3c':
Use libstdc++, not libc++_static, with protobuf.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -407,9 +407,9 @@ LOCAL_MODULE := aprotoc LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional -# Build aprotoc as a standalone binary because we copy it to +# Use the system's libstdc++ (libc++ on mac) because we copy aprotoc to # unbundled projects where libc++.so may not be available. -LOCAL_CXX_STL := libc++_static +LOCAL_CXX_STL := libstdc++ LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := $(COMPILER_SRC_FILES) |