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

Commit 3bb4b5d7 authored by Nick Chameyev's avatar Nick Chameyev
Browse files

Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt 

Updates hardcoded /system path to use
the qualifier before colon to support
/system_ext paths in dex_preopt.mk.

Bug: 155630745
Test: m dist droid with a system server
  library on a system_ext partition

Change-Id: I4dccc1f55bd2cafa13d57b46f122c44f66da335b
parent ad4df54d

core/dex_preopt.mk

+13 −1
Original line number Diff line number Diff line
@@ -64,10 +64,22 @@ boot_zip := $(PRODUCT_OUT)/boot.zip 
bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)



# TODO remove system_server_jars usages from boot.zip and depend directly on system_server.zip file.



# Use "/system" path for JARs with "platform:" prefix.

# These JARs counterintuitively use "platform" prefix but they will

# be actually installed to /system partition.

platform_system_server_jars = $(filter platform:%, $(PRODUCT_SYSTEM_SERVER_JARS))

system_server_jars := \

  $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),\

  $(foreach m,$(platform_system_server_jars),\

    $(PRODUCT_OUT)/system/framework/$(call word-colon,2,$(m)).jar)



# For the remaining system server JARs use the partition signified by the prefix.

# For example, prefix "system_ext:" will use "/system_ext" path.

other_system_server_jars = $(filter-out $(platform_system_server_jars), $(PRODUCT_SYSTEM_SERVER_JARS))

system_server_jars += \

  $(foreach m,$(other_system_server_jars),\

    $(PRODUCT_OUT)/$(call word-colon,1,$(m))/framework/$(call word-colon,2,$(m)).jar)



$(boot_zip): PRIVATE_BOOTCLASSPATH_JARS := $(bootclasspath_jars)

$(boot_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars)

$(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZIPS) $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art)