Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf am: 49cd9fb8f6 am: 8b8ec66ed9

Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: Iac9edd812791ba2a9c98ddb505c252f7a628cb5a
This commit is contained in:
Paul Duffin
2021-04-14 23:34:11 +00:00
committed by Automerger Merge Worker

View File

@@ -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))