StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 88cfa032: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."

Browse Source 
* commit '88cfa0324724c7e90bfed3aaa61c27ca0926860b':
  Enable multilib odex only if TARGET_2ND_ARCH is defined.
This commit is contained in:
Ying Wang
2014-09-16 08:22:27 +00:00
committed by Android Git Automerger
parent 66ee934c91 88cfa03247
commit e085cdda0a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.