Merge "Move vold to libc++."

10 years ago · 3685921261
parent 460a93a6d4 66d84da214
commit 3685921261
1 changed files with 2 additions and 2 deletions
--- a/Android.mk
+++ b/Android.mk
@ -51,7 +51,7 @@ LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
 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_CFLAGS := -Werror=format
 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)