commit 2a6342187a4cbb0a8804394649893b8a306ceaeb
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 22 10:43:12 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Apr 22 10:43:12 2015 -0700
tree 5c820b1343060f8ab3bd43143090cc46c6cffb8a
parent da3c4f2f0d86b7e249c9b9b6cdf3bc0225b7178e

Statically link libc++ for prebuilts

 Statically link libc++ to relocation_packer in
 order to make it work from prebuilts

Bug: http://b/18051137
Change-Id: I933ed6a0e48780a26b261069eb6a293432824fe7

tools/relocation_packer/Android.mk

diff --git a/tools/relocation_packer/Android.mk b/tools/relocation_packer/Android.mk
index 99a39c0..eabe0da 100644
--- a/tools/relocation_packer/Android.mk
+++ b/tools/relocation_packer/Android.mk
@@ -46,6 +46,9 @@
 
 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