am 9f49c34e: am 913fe559: Merge "Statically link libc++ for prebuilts"

* commit '9f49c34eecc7407fce674a82ae3a6126911efa34':
  Statically link libc++ for prebuilts
This commit is contained in:
Dmitriy Ivanov 2015-04-22 20:18:48 +00:00 committed by Android Git Automerger
commit 22e7ddd56e

View File

@ -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