summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-01 20:27:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-01 20:27:57 +0000
commit3891cfef5e27da0f33ccab42e9a14cc1e38331ee (patch)
tree0b7ab83f6d0174a6b77ae0ab8eab46b0b61a1f4f
parent221554749337a9c961c192596be5eb4e42083733 (diff)
parentbbbc634e0941d9be66b8d05adcf9dfd8c97c205f (diff)
downloadsystem_core-3891cfef5e27da0f33ccab42e9a14cc1e38331ee.zip
system_core-3891cfef5e27da0f33ccab42e9a14cc1e38331ee.tar.gz
system_core-3891cfef5e27da0f33ccab42e9a14cc1e38331ee.tar.bz2
Merge "Link libc++_static into fs_mgr."
-rw-r--r--fs_mgr/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index 61bf1ee..1179eaa 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -35,6 +35,7 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)
LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static
+LOCAL_CXX_STL := libc++_static
LOCAL_CFLAGS := -Werror