diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-05 19:01:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 19:01:23 +0000 |
| commit | bbaa54199e5778e04656ab417a2bfc8cf53bd7b8 (patch) | |
| tree | e9461168f460d615d28de634c15896914f5dff5a /NativeCode.mk | |
| parent | a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf (diff) | |
| parent | e42986412a3270c84842aefc0c7da5796429f64c (diff) | |
| download | libcore-bbaa54199e5778e04656ab417a2bfc8cf53bd7b8.zip libcore-bbaa54199e5778e04656ab417a2bfc8cf53bd7b8.tar.gz libcore-bbaa54199e5778e04656ab417a2bfc8cf53bd7b8.tar.bz2 | |
am e4298641: Merge "Fix the Mac build by moving libcore to libc++."
* commit 'e42986412a3270c84842aefc0c7da5796429f64c':
Fix the Mac build by moving libcore to libc++.
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 f7fa793..c06431f 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 |