diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-02 01:38:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-02 01:38:18 +0000 |
| commit | 487abaaf86edb06f0547a1d1e3f9341796edf597 (patch) | |
| tree | 77bccb36b3041593b5e1f1160ad4580bb08cd8f5 /fs_mgr | |
| parent | a49938e12586139509784ca6b937924966688eef (diff) | |
| parent | 1c4cdf72a685fe2b913244991b79a81a0d1c2620 (diff) | |
| download | system_core-487abaaf86edb06f0547a1d1e3f9341796edf597.zip system_core-487abaaf86edb06f0547a1d1e3f9341796edf597.tar.gz system_core-487abaaf86edb06f0547a1d1e3f9341796edf597.tar.bz2 | |
am 1c4cdf72: am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."
* commit '1c4cdf72a685fe2b913244991b79a81a0d1c2620':
Link libc++_static into fs_mgr.
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/Android.mk | 1 |
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 |