summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Stjernholm <mast@google.com> 2020-10-23 10:03:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-10-23 10:03:24 +0000
commit48d34d8ac029b34561c12657faec559b6aed12b1 (patch)
treee1ae74d9475fbf86d4c1461614ca4c1773397479
parent0b8473591ccac378c8b219c125e3ad38d3fb194c (diff)
parentc21bd0a42ce770acf743389f52c52b5292d7e3e0 (diff)
Merge "Rename ART release APEX to com.android.art."
-rw-r--r--core/tasks/boot_jars_package_check.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk
index c9a8e27614..baa378a71f 100644
--- a/core/tasks/boot_jars_package_check.mk
+++ b/core/tasks/boot_jars_package_check.mk
@@ -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))