Merge "Rename ART release APEX to com.android.art." am: 48d34d8ac0

Original change: https://android-review.googlesource.com/c/platform/build/+/1455024

Change-Id: I6f3a5f7e6e8ccc4fb297156ff0cbf65f8e1a4e60
This commit is contained in:
Martin Stjernholm
2020-10-23 10:19:43 +00:00
committed by Automerger Merge Worker

View File

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