commit c21bd0a42ce770acf743389f52c52b5292d7e3e0
author Martin Stjernholm <mast@google.com> Mon Oct 12 15:10:36 2020 +0100
committer Martin Stjernholm <mast@google.com> Wed Oct 21 15:41:02 2020 +0100
tree 0f8c69901894dd8305b2efaad09cbec949f37754
parent 0314bfa419ff3de283510a3d3425cfd1ce88b33f

Rename ART release APEX to com.android.art.

Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: Ib2e87f9ddb8ea5e7ceb2db0ea12566c0bd58ca75
Merged-In: Ib2e87f9ddb8ea5e7ceb2db0ea12566c0bd58ca75

core/tasks/boot_jars_package_check.mk

diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk
index c9a8e27..baa378a 100644
--- a/core/tasks/boot_jars_package_check.mk
+++ b/core/tasks/boot_jars_package_check.mk
@@ -26,7 +26,6 @@
 # (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 @@
   $(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))