Merge "Disable dexpreopt on targets that do not include default ART config."

am: 6dc79ada3d

Change-Id: Iff64081fba52c767fa7a0a03fd1b424eebbce577
This commit is contained in:
Ulyana Trafimovich 2019-11-04 04:19:58 -08:00 committed by android-build-merger
commit fba1b6ae33

View file

@ -80,7 +80,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
$(call json_start)
$(call add_json_bool, DisablePreopt, $(call invert_bool,$(filter true,$(WITH_DEXPREOPT))))
$(call add_json_bool, DisablePreopt, $(call invert_bool,$(and $(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)),$(filter true,$(WITH_DEXPREOPT)))))
$(call add_json_list, DisablePreoptModules, $(DEXPREOPT_DISABLED_MODULES))
$(call add_json_bool, OnlyPreoptBootImageAndSystemServer, $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))
$(call add_json_bool, GenerateApexImage, $(filter true,$(DEXPREOPT_GENERATE_APEX_IMAGE)))