diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-27 23:32:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 23:32:17 +0000 |
| commit | 07769c425288e5322265bded7735222cd9501ff5 (patch) | |
| tree | c839c1ffb596a871a5014e8ce0c4faeb05e79e06 | |
| parent | 892ced67f1da6e76aa1032f2e59ddb093a674a68 (diff) | |
| parent | 8e2163664f31b90d64b095af7c0c5d5b51188489 (diff) | |
| download | protobuf-07769c425288e5322265bded7735222cd9501ff5.tar.gz | |
am 8e216366: Merge "Stop using libstdc++."
* commit '8e2163664f31b90d64b095af7c0c5d5b51188489':
Stop using libstdc++.
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index ea8cedbae..798d4e218 100644 --- a/Android.mk +++ b/Android.mk @@ -434,9 +434,9 @@ LOCAL_MODULE := aprotoc LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_TAGS := optional -# 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 := libstdc++ +# Statically link libc++ because we copy aprotoc 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) |