commit 36859212614fd112e08dcf92065ee6db910769bb
author Dan Albert <danalbert@google.com> Thu Nov 06 00:12:48 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 06 00:12:48 2014 +0000
tree 8f2cd5d63b44145c32e8342de5cce131cdb11d67
parent 460a93a6d4d01bf0efa83acea0c84b4d43ab23c9
parent 66d84da21464b4490d7a45704e3ac3e0bb6eb313

Merge "Move vold to libc++."

Android.mk

diff --git a/Android.mk b/Android.mk
index fb43720..d3e3b61 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,7 +51,7 @@
 LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 LOCAL_MODULE_TAGS := eng tests
 
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := libc++
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -68,7 +68,7 @@
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
 
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := libc++
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)