diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-27 16:18:32 -0700 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-15 02:42:02 +0100 |
| commit | fb64d7c381ae6443f7ef90ce67dc3d9d90f9af44 (patch) | |
| tree | 85b6ac367f749926b0760daa6125d8c885bd4402 | |
| parent | 2f4d8a1b744e2e62dcd68b7cb7159000e5751975 (diff) | |
| download | external_protobuf-fb64d7c381ae6443f7ef90ce67dc3d9d90f9af44.zip external_protobuf-fb64d7c381ae6443f7ef90ce67dc3d9d90f9af44.tar.gz external_protobuf-fb64d7c381ae6443f7ef90ce67dc3d9d90f9af44.tar.bz2 | |
Stop using libstdc++.HEADreplicant-6.0-0001replicant-6.0
Statically link libc++ because we copy aprotoc to unbundled projects
where libc++.so may not be available.
Change-Id: I1f1abc015696c1ccd8600338c147d51aca2253a1
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -424,9 +424,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) |