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

Commit af78df05 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Sort PRODUCT_APEX_BOOT_JARS automatically."

parents 7d9103b3 c9ec59c7

core/product_config.mk

+5 −4
Original line number Diff line number Diff line
@@ -320,10 +320,11 @@ PRODUCT_SYSTEM_SERVER_JARS += $(PRODUCT_SYSTEM_SERVER_JARS_EXTRA) 


PRODUCT_SYSTEM_SERVER_JARS := $(call qualify-platform-jars,$(PRODUCT_SYSTEM_SERVER_JARS))



# Sort APEX system server jars. We use deterministic alphabetical order when

# constructing SYSTEMSERVERCLASSPATH definition on device after a Mainline

# update. Enforce it in the build system as well to avoid recompiling everything

# after an update due a change in SYSTEMSERVERCLASSPATH order.

# Sort APEX boot and system server jars. We use deterministic alphabetical order

# when constructing BOOTCLASSPATH and SYSTEMSERVERCLASSPATH definition on device

# after an update. Enforce it in the build system as well to avoid recompiling

# everything after an update due a change in the order.

PRODUCT_APEX_BOOT_JARS := $(sort $(PRODUCT_APEX_BOOT_JARS))

PRODUCT_APEX_SYSTEM_SERVER_JARS := $(sort $(PRODUCT_APEX_SYSTEM_SERVER_JARS))



ifndef PRODUCT_SYSTEM_NAME

target/product/default_art_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.tethering:framework-tethering \

    com.android.wifi:framework-wifi



# APEX system server jars. The list will be sorted automatically.

# APEX system server jars. Keep the list sorted by module names and then library names.

PRODUCT_APEX_SYSTEM_SERVER_JARS := \

    com.android.appsearch:service-appsearch \

    com.android.art:service-art \