Merge "Statically link libc++ for prebuilts"

2015-04-22 18:15:25 +00:00
parent a00a9f0b7e 2a6342187a
commit 913fe559f6
1 changed files with 3 additions and 0 deletions
--- a/tools/relocation_packer/Android.mk
+++ b/tools/relocation_packer/Android.mk
@@ -46,6 +46,9 @@ LOCAL_CPP_EXTENSION := .cc

 LOCAL_SRC_FILES := src/main.cc
 LOCAL_STATIC_LIBRARIES := lib_relocation_packer libelf
+
+# Statically linking libc++ to make it work from prebuilts
+LOCAL_CXX_STL := libc++_static
 LOCAL_C_INCLUDES := external/elfutils/src/libelf libnativehelper/include

 LOCAL_MODULE := relocation_packer