commit 1395efa1ba4005d70444200d8a30871e180acec1
author Dan Albert <danalbert@google.com> Thu Apr 02 01:38:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 02 01:38:18 2015 +0000
tree 77bccb36b3041593b5e1f1160ad4580bb08cd8f5
parent 613a336674b33887145ba72d074bb71d3ad4b037
parent dc618c4a4c0d2159548b2ec6bec666f9d0bdc310

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

* commit '1c4cdf72a685fe2b913244991b79a81a0d1c2620':
  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