diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-06 15:14:56 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-02-06 15:16:11 -0800 |
| commit | 58e00bc69fc2e309384b09ec6088e65f3d322cd6 (patch) | |
| tree | 7cb41e2927bf6151487125919f32f3d211bd57cc /Android.mk | |
| parent | f2982dd208b744cde5dd54dcd4b4c53f47f03712 (diff) | |
| download | external_protobuf-58e00bc69fc2e309384b09ec6088e65f3d322cd6.zip external_protobuf-58e00bc69fc2e309384b09ec6088e65f3d322cd6.tar.gz external_protobuf-58e00bc69fc2e309384b09ec6088e65f3d322cd6.tar.bz2 | |
Use libstdc++, not libc++_static, with protobuf.
libc++_static causes problems with some windows builds. libstdc++
reverts back to the old behavior of using the system's libstdc++ (or
libc++ on darwin).
Bug: 19285118
Change-Id: Ib4fca25da24746e55b620db63f2f810ba3794f3d
Diffstat (limited to 'Android.mk')
| -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) |