From 7f093f70834432a5d202ae093cf3afd30b394730 Mon Sep 17 00:00:00 2001 From: Chris Gross Date: Fri, 1 May 2020 16:04:36 -0700 Subject: [PATCH] Allow bootjars in system_ext. Bug: 148385042 Test: Built and booted Pixel 3a both with and without a boot jar in system_ext. Change-Id: I17c95a6347552d4cf0db76c10d762c591b56d48a --- core/tasks/boot_jars_package_check.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk index cbaa682b7..02d7212b5 100644 --- a/core/tasks/boot_jars_package_check.mk +++ b/core/tasks/boot_jars_package_check.mk @@ -26,7 +26,7 @@ stamp := $(intermediates)/stamp # Convert the colon-separated components : to . names # (e.g. com.android.media:updatable-media -> updatable-media.com.android.media). # Special cases: -# - for the "platform" apex drop the . suffix +# - 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))) \ @@ -34,6 +34,7 @@ boot_jars := $(foreach pair,$(PRODUCT_BOOT_JARS) $(PRODUCT_UPDATABLE_BOOT_JARS), $(eval q := :) \ $(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))