commit 913fe559f69395aaf160653c1d3994df3272810b
author Dmitriy Ivanov <dimitry@google.com> Wed Apr 22 18:15:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 22 18:15:27 2015 +0000
tree df24fc8cb4a56ad851c7bb2bbef6d9038485094c
parent a00a9f0b7ed39589a768798de6a584a4baae030b
parent 2a6342187a4cbb0a8804394649893b8a306ceaeb

Merge "Statically link libc++ for prebuilts"

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