Merge "Add logic to preopt both archs for SDK libs" (cab74081) · Commits · e / os / android_build

core/dex_preopt_odex_install.mk

+7 −2

Original line number	Diff line number	Diff line
		@@ -193,14 +193,19 @@ installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
		installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
		else # boot jar
		ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

		my_module_multilib := $(LOCAL_MULTILIB)
		# If the module is not an SDK library and it's a system server jar, only preopt the primary arch.
		my_filtered_lib_name := $(patsubst %.impl,%,$(LOCAL_MODULE))
		ifeq (,$(filter $(JAVA_SDK_LIBRARIES),$(my_filtered_lib_name)))
		# For a Java library, by default we build odex for both 1st arch and 2nd arch.
		# But it can be overridden with "LOCAL_MULTILIB := first".
		ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
		# For system server jars, we build for only "first".
		my_module_multilib := first
		else
		my_module_multilib := $(LOCAL_MULTILIB)
		endif
		endif

		# #################################################
		# Odex for the 1st arch
		my_2nd_arch_prefix :=

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
		services \
		ethernet-service \
		wifi-service \
		com.android.location.provider \
		com.android.location.provider.impl \

		# Adoptable external storage supports both ext4 and f2fs
		PRODUCT_PACKAGES += \