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

* commit '36859212614fd112e08dcf92065ee6db910769bb':
  Move vold to libc++.
This commit is contained in:
Dan Albert 2014-11-06 00:15:12 +00:00 committed by Android Git Automerger
commit 89bcc638ab

View file

@ -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)