From f6010eca09e943616b069e5bb38ee3589134e7bb Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Mon, 21 Sep 2015 20:28:36 -0700 Subject: [PATCH] Fix static build when libbacktrace links llvm libraries. Bug: 22229391 Change-Id: I8a2f3471cc1915e1e4e1eea0898219614e289ef3 --- build/Android.executable.mk | 5 ++++- dex2oat/Android.mk | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 72cf97833..3b2d1cc93 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -101,7 +101,10 @@ define build-art-executable # TODO: Having this is not ideal as it might obscure errors. Try to get rid of it. LOCAL_LDFLAGS += -z muldefs ifeq ($$(HOST_OS),linux) - LOCAL_LDLIBS += -lrt + LOCAL_LDLIBS += -lrt -lncurses -ltinfo + endif + ifeq ($$(HOST_OS),darwin) + LOCAL_LDLIBS += -lncurses -ltinfo endif endif diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 3cfdc4c80..e252765ea 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -58,14 +58,16 @@ endif ifeq ($(ART_BUILD_HOST_NDEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libsigchain libziparchive-host,art/compiler,host,ndebug,$(dex2oat_host_arch))) ifeq ($(ART_BUILD_HOST_STATIC),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart libart-compiler libart libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixl liblog libz libbacktrace libcutils libunwindbacktrace libutils libbase,art/compiler,host,ndebug,$(dex2oat_host_arch),static)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart libart-compiler libart libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixl liblog libz \ + libbacktrace libLLVMObject libLLVMBitReader libLLVMMC libLLVMMCParser libLLVMCore libLLVMSupport libcutils libunwindbacktrace libutils libbase,art/compiler,host,ndebug,$(dex2oat_host_arch),static)) endif endif ifeq ($(ART_BUILD_HOST_DEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libsigchain libziparchive-host,art/compiler,host,debug,$(dex2oat_host_arch))) ifeq ($(ART_BUILD_HOST_STATIC),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd libartd-compiler libartd libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixld liblog libz libbacktrace libcutils libunwindbacktrace libutils libbase,art/compiler,host,debug,$(dex2oat_host_arch),static)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd libartd-compiler libartd libziparchive-host libnativehelper libnativebridge libsigchain_dummy libvixld liblog libz \ + libbacktrace libLLVMObject libLLVMBitReader libLLVMMC libLLVMMCParser libLLVMCore libLLVMSupport libcutils libunwindbacktrace libutils libbase,art/compiler,host,debug,$(dex2oat_host_arch),static)) endif endif -- 2.11.0