From d418e961c86f40a77b47f08f8a26fc3407bdda7a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 14 Apr 2021 20:30:07 +0100 Subject: [PATCH] Make sure that BootJars is super set of ArtApexJars When constructing the dexpreopt config it will strip out any entries in ART_APEX_JARS which are not present in PRODUCT_BOOT_JARS and store the remainder in ArtApexJars. Bug: 185391652 Test: lunch sdk_phone_x86_vendor && m nothing lunch sdk_phone_x86 && m nothing Change-Id: I403ef9768a8ac2d222bbd6cfd0a68a2019f67c16 --- core/dex_preopt_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 2762b4429..51238a36c 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -105,7 +105,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) $(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOOT_JARS)) - $(call add_json_list, ArtApexJars, $(ART_APEX_JARS)) + $(call add_json_list, ArtApexJars, $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS))) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) $(call add_json_list, UpdatableSystemServerJars, $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))