diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-04 15:21:13 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-04 16:02:19 -0800 |
| commit | b3aacde3d8af759ee4a7b395c636ea360547d92d (patch) | |
| tree | 6afd8816bb0d2ea0362d3dae6384b8ca1c40e3a3 /NativeCode.mk | |
| parent | ef4d1341e70d2683d5d9f2a8892535ae90eb184c (diff) | |
| download | libcore-b3aacde3d8af759ee4a7b395c636ea360547d92d.zip libcore-b3aacde3d8af759ee4a7b395c636ea360547d92d.tar.gz libcore-b3aacde3d8af759ee4a7b395c636ea360547d92d.tar.bz2 | |
Move from UniquePtr to std::unique_ptr.
Switch from stlport to libcxx as stlport lacks std::unique_ptr.
Change-Id: I45a3588a8ecf4689521f1df6654ed279a6d0669e
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 12e8114..b3061aa 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 |