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

Add logic to preopt both archs for SDK libs

Browse Source 
Update stale PRODUCT_SYSTEM_SERVER_JARS list since
com.android.location.provider was renamed to
com.android.location.provider.impl.

Added logic to preopt both archs for SDK libs that are also system
server JARS.

Bug: 110780021
Test: manual and verify speed compiled

Change-Id: I34e728444ffda6db3375b638028d54b6ab623209
This commit is contained in:
Mathieu Chartier
2018-07-06 13:29:43 -07:00
parent b79242dbab
commit 4568c2d908
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/dex_preopt_odex_install.mk
View File

@@ -187,14 +187,19 @@ installed_odex := $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) installed_odex += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
else # boot jar else # boot jar
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) 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. # 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". # But it can be overridden with "LOCAL_MULTILIB := first".
ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE))) ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS),$(LOCAL_MODULE)))
# For system server jars, we build for only "first". # For system server jars, we build for only "first".
my_module_multilib := first my_module_multilib := first
else
my_module_multilib := $(LOCAL_MULTILIB)
endif endif
endif
# ################################################# # #################################################
# Odex for the 1st arch # Odex for the 1st arch
my_2nd_arch_prefix := my_2nd_arch_prefix :=

2
target/product/core_minimal.mk
View File

@@ -81,7 +81,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
services \ services \
ethernet-service \ ethernet-service \
wifi-service \ wifi-service \
com.android.location.provider \ com.android.location.provider.impl \
# Adoptable external storage supports both ext4 and f2fs # Adoptable external storage supports both ext4 and f2fs
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \