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

Commit 35a7a43b authored by satayev's avatar satayev
Browse files

Add 'platform:' prefix to unqualified system server jars. 

This allows Soong side changes to treat SystemServerJars as
android.ConfiguredJarList, same as boot jars.

Bug: 180105615, 155630745
Test: m && launch_cvd
Change-Id: I717d4351edcd82028ac19cb9265e18b98d11c661
parent bf7d6d78

core/dex_preopt.mk

+3 −1
Original line number Diff line number Diff line
@@ -62,7 +62,9 @@ ifeq ($(PRODUCT_USES_DEFAULT_ART_CONFIG), true) 


boot_zip := $(PRODUCT_OUT)/boot.zip

bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)

system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)

system_server_jars := \

  $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),\

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



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

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

core/dex_preopt_odex_install.mk

+2 −1
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ endif 
# /data. If we don't do this they will need to be extracted which is not favorable for RAM usage

# or performance. If my_preopt_for_extracted_apk is true, we ignore the only preopt boot image

# options.

system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(call word-colon,2,$(m)))

ifneq (true,$(my_preopt_for_extracted_apk))

  ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))

    ifeq ($(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)

    ifeq ($(filter $(system_server_jars) $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)

      LOCAL_DEX_PREOPT :=

    endif

  endif

core/product_config.mk

+16 −3
Original line number Diff line number Diff line
@@ -231,12 +231,23 @@ PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) $(PRODUCT_AAPT_CONFIG) 
PRODUCT_AAPT_CONFIG_SP := $(PRODUCT_AAPT_CONFIG)

PRODUCT_AAPT_CONFIG := $(subst $(space),$(comma),$(PRODUCT_AAPT_CONFIG))



###########################################################

## Add 'platform:' prefix to jars not in <apex>:<module> format.

##

## This makes sure that a jar corresponds to ConfigureJarList format of <apex> and <module> pairs

## where needed.

##

## $(1): a list of jars either in <module> or <apex>:<module> format

###########################################################



define qualify-platform-jars

  $(foreach jar,$(1),$(if $(findstring :,$(jar)),,platform:)$(jar))

endef



# Extra boot jars must be appended at the end after common boot jars.

PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA)



# Add 'platform:' prefix to unqualified boot jars

PRODUCT_BOOT_JARS := $(foreach pair,$(PRODUCT_BOOT_JARS), \

  $(if $(findstring :,$(pair)),,platform:)$(pair))

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



# Replaces references to overridden boot jar modules in a boot jars variable.

# $(1): Name of a boot jars variable with <apex>:<jar> pairs.
@@ -254,6 +265,8 @@ $(call replace-boot-jar-module-overrides,ART_APEX_JARS) 
# The extra system server jars must be appended at the end after common system server jars.

PRODUCT_SYSTEM_SERVER_JARS += $(PRODUCT_SYSTEM_SERVER_JARS_EXTRA)



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



ifndef PRODUCT_SYSTEM_NAME

  PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME)

endif