summaryrefslogtreecommitdiffstats
path: root/fs_mgr
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-01 20:48:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 20:48:24 +0000
commit1c4cdf72a685fe2b913244991b79a81a0d1c2620 (patch)
tree0d6b0be89553ded26687156749d9acca0b83a239 /fs_mgr
parent93f7fbab77d81b28f4a66599c9f6f813e10c83da (diff)
parent4f6c526e13eb00c94f8745fb9e52f10c3474a87f (diff)
downloadsystem_core-1c4cdf72a685fe2b913244991b79a81a0d1c2620.zip
system_core-1c4cdf72a685fe2b913244991b79a81a0d1c2620.tar.gz
system_core-1c4cdf72a685fe2b913244991b79a81a0d1c2620.tar.bz2
am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."
* commit '4f6c526e13eb00c94f8745fb9e52f10c3474a87f': Link libc++_static into fs_mgr.
Diffstat (limited to '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