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

* commit '36859212': Move vold to libc++.

am 36859212: Merge "Move vold to libc++."
* commit '36859212': Move vold to libc++.
89bcc638 · Dan Albert · Android Git Automerger · a05cb413 · 36859212 · 89bcc638
Commit 89bcc638 authored 10 years ago by Dan Albert Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Android.mk Android.mk +2 -2

No files found.
--- a/Android.mk
+++ b/Android.mk
@@ -62,7 +62,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)
@@ -79,7 +79,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)