openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Allow bootjars in system_ext." am: ad0329462b am: c0793d73f4 

Change-Id: I95ad6ae1700d98372d3f2541f4762a8828a1c584
This commit is contained in:
Chris Gross 2020-05-05 21:33:58 +00:00 committed by Automerger Merge Worker
parent ade423cbb0 c0793d73f4
commit fce49d95be
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/tasks/boot_jars_package_check.mk
View File

@ -26,7 +26,7 @@ stamp := $(intermediates)/stamp
# Convert the colon-separated components <apex>:<jar> to <jar>.<apex> names # Convert the colon-separated components <apex>:<jar> to <jar>.<apex> names
# (e.g. com.android.media:updatable-media -> updatable-media.com.android.media). # (e.g. com.android.media:updatable-media -> updatable-media.com.android.media).
# Special cases: # Special cases:
# - for the "platform" apex drop the .<apex> suffix # - for the "platform" or "system_ext" apex drop the .<apex> suffix
# - for the ART apex select release variant # - for the ART apex select release variant
boot_jars := $(foreach pair,$(PRODUCT_BOOT_JARS) $(PRODUCT_UPDATABLE_BOOT_JARS), \ boot_jars := $(foreach pair,$(PRODUCT_BOOT_JARS) $(PRODUCT_UPDATABLE_BOOT_JARS), \
$(eval apex := $(call word-colon,1,$(pair))) \ $(eval apex := $(call word-colon,1,$(pair))) \
@ -34,6 +34,7 @@ boot_jars := $(foreach pair,$(PRODUCT_BOOT_JARS) $(PRODUCT_UPDATABLE_BOOT_JARS),
$(eval q := :) \ $(eval q := :) \
$(eval sfx := $(q).$(apex)$(q)) \ $(eval sfx := $(q).$(apex)$(q)) \
$(eval sfx := $(subst $(q).platform$(q),$(q)$(q),$(sfx))) \ $(eval sfx := $(subst $(q).platform$(q),$(q)$(q),$(sfx))) \
$(eval sfx := $(subst $(q).system_ext$(q),$(q)$(q),$(sfx))) \
$(eval sfx := $(subst $(q).com.android.art$(q),$(q).com.android.art.release$(q),$(sfx))) \ $(eval sfx := $(subst $(q).com.android.art$(q),$(q).com.android.art.release$(q),$(sfx))) \
$(eval sfx := $(patsubst $(q)%$(q),%,$(sfx))) \ $(eval sfx := $(patsubst $(q)%$(q),%,$(sfx))) \
$(jar)$(sfx)) $(jar)$(sfx))