From 66d84da21464b4490d7a45704e3ac3e0bb6eb313 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 5 Nov 2014 14:48:45 -0800 Subject: [PATCH] Move vold to libc++. Bug: 15193147 Change-Id: Ib868f1ed8145ca5cbfdb4cd60ed0c47a6182ac62 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index fb43720..d3e3b61 100644 --- 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)