StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the boot image mainline extension when dexpreopting in Make.

Browse Source 
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.

Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
  out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
  on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
This commit is contained in:
Jiakai Zhang
2023-03-20 18:42:13 +00:00
parent 4fac9d776c
commit fb2734e36b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/dex_preopt_odex_install.mk
View File

@@ -272,12 +272,13 @@ my_dexpreopt_images :=
my_dexpreopt_images_deps :=
my_dexpreopt_image_locations_on_host :=
my_dexpreopt_image_locations_on_device :=
# Infix can be 'boot' or 'art'. Soong creates a set of variables for Make, one
# for each boot image (primary and the framework extension). The only reason why
# the primary image is exposed to Make is testing (art gtests) and benchmarking
# (art golem benchmarks). Install rules that use those variables are in
# dex_preopt_libart.mk. Here for dexpreopt purposes the infix is always 'boot'.
my_dexpreopt_infix := boot
# Infix can be 'art', 'boot', or 'mainline'. Soong creates a set of variables
# for Make, one or each boot image (primary, the framework extension, and the
# mainline extension). The only reason why the primary image is exposed to Make
# is testing (art gtests) and benchmarking (art golem benchmarks). Install rules
# that use those variables are in dex_preopt_libart.mk. Here for dexpreopt
# purposes the infix is always 'boot' or 'mainline'.
my_dexpreopt_infix := $(if $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP)),mainline,boot)
my_create_dexpreopt_config :=
ifdef LOCAL_DEX_PREOPT
@@ -507,4 +508,4 @@ ifdef LOCAL_DEX_PREOPT
my_dexpreopt_zip :=
my_dexpreopt_config_for_postprocessing :=
endif # LOCAL_DEX_PREOPT
endif # my_create_dexpreopt_config
endif # my_create_dexpreopt_config