commit b3aacde3d8af759ee4a7b395c636ea360547d92d
author Ian Rogers <irogers@google.com> Tue Nov 04 15:21:13 2014 -0800
committer Ian Rogers <irogers@google.com> Tue Nov 04 16:02:19 2014 -0800
tree 6afd8816bb0d2ea0362d3dae6384b8ca1c40e3a3
parent ef4d1341e70d2683d5d9f2a8892535ae90eb184c

Move from UniquePtr to std::unique_ptr.

Switch from stlport to libcxx as stlport lacks std::unique_ptr.

Change-Id: I45a3588a8ecf4689521f1df6654ed279a6d0669e

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 12e8114..b3061aa 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -87,7 +87,7 @@
 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_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