openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Enable multilib odex only if TARGET_2ND_ARCH is defined. 

Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
This commit is contained in:
Ying Wang 2014-09-15 11:45:52 -07:00
parent ce851e88d9
commit 7a8991991f
1 changed files with 4 additions and 2 deletions

6
core/dex_preopt_odex_install.mk
View File

@ -82,14 +82,16 @@ else # must be APPS
# The preferred arch
my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/setup_one_odex.mk
ifdef TARGET_2ND_ARCH
ifeq ($(LOCAL_MULTILIB),both)
# The non-preferred arch
my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
include $(BUILD_SYSTEM)/setup_one_odex.mk
endif # LOCAL_MULTILIB is both
endif # TARGET_2ND_ARCH
endif # LOCAL_MODULE_CLASS
endif # libart
endif # boot jar
endif # libart
endif # boot jar
ifdef built_odex
# Use pattern rule - we may have multiple installed odex files.