diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-04 20:24:36 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-04 20:35:58 -0800 |
| commit | f277bbcc1368de99dbee1817c08f1b2be8e17113 (patch) | |
| tree | 8b1b7c381f5febf7a08a43955a8b2e2fd3dfd7b8 /NativeCode.mk | |
| parent | f9a3c05f9ed2a8e0b4257f9fd1695cef2a6124b9 (diff) | |
| download | libcore-f277bbcc1368de99dbee1817c08f1b2be8e17113.zip libcore-f277bbcc1368de99dbee1817c08f1b2be8e17113.tar.gz libcore-f277bbcc1368de99dbee1817c08f1b2be8e17113.tar.bz2 | |
Fix the Mac build by moving libcore to libc++.
Since libcore is now using std::unique_ptr, we need to have a sane,
modern STL on all platforms. Since the Mac build is stuck on libstdc++
4.2, use libc++.
Change-Id: Id4cd32fa181ae53123f808a9366211748c44276f
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index b3061aa..32e7783 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -128,6 +128,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils LOCAL_MULTILIB := both +LOCAL_CXX_STL := libc++ include $(BUILD_HOST_SHARED_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) @@ -142,5 +143,6 @@ ifeq ($(LIBCORE_SKIP_TESTS),) LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := libcrypto-host + LOCAL_CXX_STL := libc++ include $(BUILD_HOST_SHARED_LIBRARY) endif # LIBCORE_SKIP_TESTS |