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

Commit 4cb3365e authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by android-build-merger
Browse files

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

Merge "Disable dexpreopt on targets that do not include default ART config." am: 6dc79ada am: fba1b6ae
am: 5e16d6a7

Change-Id: I46a7e91db2bf9e8319c278fec91e428478a62bc8
parents d5b66471 5e16d6a7

core/dex_preopt_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)))