diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-05 10:50:13 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-05 10:50:13 -0800 |
| commit | a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf (patch) | |
| tree | dffcb3954ff6ea3c9036033eec01fac0ba0e6865 /NativeCode.mk | |
| parent | 2d3e650f8ef1aed488f870aa3d1028775e353490 (diff) | |
| parent | f9a3c05f9ed2a8e0b4257f9fd1695cef2a6124b9 (diff) | |
| download | libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.zip libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.tar.gz libcore-a5e1285a6d5ef8e6602f39cf33277cde2f6bccbf.tar.bz2 | |
resolved conflicts for merge of f9a3c05f to stage-aosp-master
Change-Id: Id4220cfc2f845d04b32404171cde1fd144fe1585
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 0ae615e..f7fa793 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -87,7 +87,7 @@ LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) # Test JNI library. @@ -102,7 +102,7 @@ LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk -include external/stlport/libstlport.mk +LOCAL_CXX_STL := libc++ include $(BUILD_SHARED_LIBRARY) endif # LIBCORE_SKIP_TESTS |