tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a am: 5325cd5cdf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: I8580a642c577b1f4c0f012ec967f5f60e19d178c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nicolas Geoffray 2023-03-21 18:23:29 +00:00 committed by Automerger Merge Worker
commit 02844ff77b
1 changed files with 8 additions and 7 deletions
Show stats 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