am 7a899199: Enable multilib odex only if TARGET_2ND_ARCH is defined. (e7296eb2) · Commits · e / os / android_build

core/dex_preopt_odex_install.mk

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,11 +82,13 @@ else # must be APPS
	# The preferred arch		# The preferred arch
	my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)		my_2nd_arch_prefix := $(LOCAL_2ND_ARCH_VAR_PREFIX)
	include $(BUILD_SYSTEM)/setup_one_odex.mk		include $(BUILD_SYSTEM)/setup_one_odex.mk
			ifdef TARGET_2ND_ARCH
	ifeq ($(LOCAL_MULTILIB),both)		ifeq ($(LOCAL_MULTILIB),both)
	# The non-preferred arch		# The non-preferred arch
	my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))		my_2nd_arch_prefix := $(if $(LOCAL_2ND_ARCH_VAR_PREFIX),,$(TARGET_2ND_ARCH_VAR_PREFIX))
	include $(BUILD_SYSTEM)/setup_one_odex.mk		include $(BUILD_SYSTEM)/setup_one_odex.mk
	endif # LOCAL_MULTILIB is both		endif # LOCAL_MULTILIB is both
			endif # TARGET_2ND_ARCH
	endif # LOCAL_MODULE_CLASS		endif # LOCAL_MODULE_CLASS
	endif # libart		endif # libart
	endif # boot jar		endif # boot jar