tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add logic to preopt both archs for SDK libs"

Browse source 
am: f3c54cfa78

Change-Id: I1f0336118e71c7da5fa5526425121811c0faace6
This commit is contained in:
Mathieu Chartier 2018-07-09 12:58:13 -07:00 committed by android-build-merger
commit cab7408131
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/dex_preopt_odex_install.mk
View file

@ -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 :=

2
target/product/core_minimal.mk
View file

@ -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 += \