Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 603cd946 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6f3a5f7e6e8ccc4fb297156ff0cbf65f8e1a4e60
parents 5f8a512d 48d34d8a

core/tasks/boot_jars_package_check.mk

+0 −2
Original line number Diff line number Diff line
@@ -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))