Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 502892a9 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Add logic to preopt both archs for SDK libs 

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

(cherry picked from commit 4568c2d9)

Merged-In: I34e728444ffda6db3375b638028d54b6ab623209
Change-Id: If0cb68ba4808aa8716099c5447645f4baac63f30
parent cf915464

core/dex_preopt_odex_install.mk

+7 −2
Original line number Diff line number Diff line
@@ -191,14 +191,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 :=

target/product/core_minimal.mk

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
    services \

    ethernet-service \

    wifi-service \

    com.android.location.provider \

    com.android.location.provider.impl \



# The set of packages whose code can be loaded by the system server.

PRODUCT_SYSTEM_SERVER_APPS += \