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

Commit 7f093f70 authored by Chris Gross's avatar Chris Gross
Browse files

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
parent 4c69c2ff

core/tasks/boot_jars_package_check.mk

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ stamp := $(intermediates)/stamp 
# Convert the colon-separated components <apex>:<jar> to <jar>.<apex> names

# (e.g. com.android.media:updatable-media -> updatable-media.com.android.media).

# Special cases:

#   - for the "platform" apex drop the .<apex> suffix

#   - 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))) \
@@ -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))