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

Commit b7707161 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge changes from topics "target-build-unbundled", "unbundled-preopt" am:... 

Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df7 am: 9d7c4c0a am: 1a55074c

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

Change-Id: If3cc8f835bc0eca2e740ae0b6682b030134d3d65
parents 823285a5 1a55074c

core/dex_preopt_config.mk

+10 −1
Original line number Diff line number Diff line 
DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config



ENABLE_PREOPT := true

ifneq (true,$(filter true,$(WITH_DEXPREOPT)))

  ENABLE_PREOPT :=

else ifneq (true,$(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)))

  ENABLE_PREOPT :=

else ifneq (,$(TARGET_BUILD_APPS))

  ENABLE_PREOPT :=

endif



# The default value for LOCAL_DEX_PREOPT

DEX_PREOPT_DEFAULT ?= true
@@ -63,7 +72,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 


  $(call json_start)



  $(call add_json_bool, DisablePreopt,                           $(call invert_bool,$(and $(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)),$(filter true,$(WITH_DEXPREOPT)))))

  $(call add_json_bool, DisablePreopt,                           $(call invert_bool,$(ENABLE_PREOPT)))

  $(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, UseArtImage,                             $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))