tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df75f am: 9d7c4c0a69 am: 1a55074cec am: b7707161de

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

Change-Id: I712bfc62acaaf100fd3893d994e97404d1afd42c
This commit is contained in:
Martin Stjernholm 2020-06-11 11:18:30 +00:00 committed by Automerger Merge Worker
commit d40b10fdba
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/dex_preopt_config.mk
View file

@ -1,5 +1,14 @@
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)))