commit dc618c4a4c0d2159548b2ec6bec666f9d0bdc310
author Dan Albert <danalbert@google.com> Wed Apr 01 20:48:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 01 20:48:24 2015 +0000
tree 0d6b0be89553ded26687156749d9acca0b83a239
parent 67b8675e264418acaa06121d275038f8b1c503be
parent 13d60401b49cd92102a30f1063f206d13bac78e2

am 4f6c526e: am 3891cfef: Merge "Link libc++_static into fs_mgr."

* commit '4f6c526e13eb00c94f8745fb9e52f10c3474a87f':
  Link libc++_static into fs_mgr.

fs_mgr/Android.mk

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