commit 89bcc638ab24af7bee0ff3ccfa190a08b721f0a4
author Dan Albert <danalbert@google.com> Thu Nov 06 00:15:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 06 00:15:12 2014 +0000
tree 0e9b147cdcecac88699521047cf268ddf9005c76
parent a05cb41300b652e6125c6df42d4aa756101e6e72
parent 36859212614fd112e08dcf92065ee6db910769bb

am 36859212: Merge "Move vold to libc++."

* commit '36859212614fd112e08dcf92065ee6db910769bb':
  Move vold to libc++.

Android.mk

diff --git a/Android.mk b/Android.mk
index f0747b9..05d75fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,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)
@@ -79,7 +79,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)