From c21bd0a42ce770acf743389f52c52b5292d7e3e0 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Mon, 12 Oct 2020 15:10:36 +0100 Subject: [PATCH] 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 | 2 -- 1 file changed, 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 . 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))