Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined." (88cfa032) · Commits · e / os / android_build

core/dex_preopt_odex_install.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -82,11 +82,13 @@ 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