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

Add a Make variable to determine ART boot image jars for testing.

Browse source 
Bug: 290583827
Test: m nothing
Change-Id: Ibd0dd99593e4efb357e674c6a89804ea9cd47a84
This commit is contained in:
Jiakai Zhang 2023-07-12 16:55:10 +01:00
parent 17c6af46df
commit 7bdb2b3c32
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/dex_preopt_config.mk
View file

@ -111,6 +111,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
$(call add_json_list, ApexBootJars, $(PRODUCT_APEX_BOOT_JARS)) $(call add_json_list, ApexBootJars, $(PRODUCT_APEX_BOOT_JARS))
$(call add_json_list, ArtApexJars, $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS))) $(call add_json_list, ArtApexJars, $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
$(call add_json_list, TestOnlyArtBootImageJars, $(PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS))
$(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))
$(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS))
$(call add_json_list, ApexSystemServerJars, $(PRODUCT_APEX_SYSTEM_SERVER_JARS)) $(call add_json_list, ApexSystemServerJars, $(PRODUCT_APEX_SYSTEM_SERVER_JARS))

3
core/product.mk
View file

@ -146,6 +146,9 @@ _product_list_vars += PRODUCT_BOOT_JARS
# PRODUCT_BOOT_JARS, so that device-specific jars go after common jars. # PRODUCT_BOOT_JARS, so that device-specific jars go after common jars.
_product_list_vars += PRODUCT_BOOT_JARS_EXTRA _product_list_vars += PRODUCT_BOOT_JARS_EXTRA
# List of jars to be included in the ART boot image for testing.
_product_list_vars += PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS
_product_single_value_vars += PRODUCT_SUPPORTS_VBOOT _product_single_value_vars += PRODUCT_SUPPORTS_VBOOT
_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS _product_list_vars += PRODUCT_SYSTEM_SERVER_APPS
# List of system_server classpath jars on the platform. # List of system_server classpath jars on the platform.

5
target/product/default_art_config.mk
View file

@ -38,6 +38,11 @@ endif
PRODUCT_BOOT_JARS := \ PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) $(ART_APEX_JARS)
# List of jars to be included in the ART boot image for testing.
# DO NOT reorder this list. The order must match the one described above.
PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS := \
$(ART_APEX_JARS)
# /system and /system_ext boot jars. # /system and /system_ext boot jars.
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
framework-minus-apex \ framework-minus-apex \