| commit | 4f6c526e13eb00c94f8745fb9e52f10c3474a87f | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Apr 01 20:37:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 20:37:48 2015 +0000 |
| tree | 0d6b0be89553ded26687156749d9acca0b83a239 | |
| parent | 4bf0438083bfd789ee7e59bf6c358c4a83b62f07 [diff] | |
| parent | 3891cfef5e27da0f33ccab42e9a14cc1e38331ee [diff] |
am 3891cfef: Merge "Link libc++_static into fs_mgr." * commit '3891cfef5e27da0f33ccab42e9a14cc1e38331ee': Link libc++_static into fs_mgr.
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_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