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

Commit 7bdb2b3c authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

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

Bug: 290583827
Test: m nothing
Change-Id: Ibd0dd99593e4efb357e674c6a89804ea9cd47a84
parent 17c6af46

core/dex_preopt_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, BootJars,                                $(PRODUCT_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, TestOnlyArtBootImageJars,                $(PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS))

  $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))

  $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, ApexSystemServerJars,                    $(PRODUCT_APEX_SYSTEM_SERVER_JARS))

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ _product_list_vars += PRODUCT_BOOT_JARS 
# PRODUCT_BOOT_JARS, so that device-specific jars go after common jars.

_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_list_vars += PRODUCT_SYSTEM_SERVER_APPS

# List of system_server classpath jars on the platform.

target/product/default_art_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ endif 
PRODUCT_BOOT_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.

PRODUCT_BOOT_JARS += \

    framework-minus-apex \