diff options
| author | 2016-02-23 10:41:25 +0000 | |
|---|---|---|
| committer | 2016-02-23 10:41:25 +0000 | |
| commit | 4764d4e253aaea1595bbe1f5aaa8677ea9319b79 (patch) | |
| tree | c4bd39e36ce5d313ba08a313a0cdbf595ecf818c | |
| parent | 920e1230d617ec1194dc22cab3ec9d704e1b30dc (diff) | |
| parent | dccd6753b42b73d75f7b5e51ad3515009873c9ff (diff) | |
Merge "Fix static dex2oat build"
| -rw-r--r-- | dex2oat/Android.mk | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index 77f8d6cd9f..dfc379fdae 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -55,20 +55,42 @@ ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libsigchain,art/compiler,target,debug,$(dex2oat_target_arch))) endif +# Note: the order is important because of static linking resolution. +DEX2OAT_STATIC_DEPENDENCIES := \ + libziparchive-host \ + libnativehelper \ + libnativebridge \ + libnativeloader \ + libsigchain_dummy \ + libvixl \ + liblog \ + libz \ + libbacktrace \ + libLLVMObject \ + libLLVMBitReader \ + libLLVMMC \ + libLLVMMCParser \ + libLLVMCore \ + libLLVMSupport \ + libcutils \ + libunwindbacktrace \ + libutils \ + libbase \ + liblz4 \ + liblzma + # We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target. ifeq ($(ART_BUILD_HOST_NDEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libsigchain libziparchive-host liblz4,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 libLLVMObject libLLVMBitReader libLLVMMC libLLVMMCParser libLLVMCore libLLVMSupport libcutils libunwindbacktrace libutils libbase liblz4,art/compiler,host,ndebug,$(dex2oat_host_arch),static)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart libart-compiler libart $(DEX2OAT_STATIC_DEPENDENCIES),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 liblz4,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 libLLVMObject libLLVMBitReader libLLVMMC libLLVMMCParser libLLVMCore libLLVMSupport libcutils libunwindbacktrace libutils libbase liblz4,art/compiler,host,debug,$(dex2oat_host_arch),static)) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd libartd-compiler libartd $(DEX2OAT_STATIC_DEPENDENCIES),art/compiler,host,debug,$(dex2oat_host_arch),static)) endif endif |