Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes: Add a Make variable to disable all dexpreopt and dexopt activities. Update dexopt system properties.
This commit is contained in:
@@ -202,7 +202,7 @@ _board_strip_readonly_list += $(_build_broken_var_list) \
|
||||
|
||||
# Conditional to building on linux, as dex2oat currently does not work on darwin.
|
||||
ifeq ($(HOST_OS),linux)
|
||||
WITH_DEXPREOPT := true
|
||||
WITH_DEXPREOPT ?= true
|
||||
endif
|
||||
|
||||
# ###############################################################
|
||||
|
@@ -58,25 +58,10 @@ DEX_PREOPT_WITH_UPDATABLE_BCP := true
|
||||
|
||||
# Conditional to building on linux, as dex2oat currently does not work on darwin.
|
||||
ifeq ($(HOST_OS),linux)
|
||||
ifeq (eng,$(TARGET_BUILD_VARIANT))
|
||||
# For an eng build only pre-opt the boot image and system server. This gives reasonable performance
|
||||
# and still allows a simple workflow: building in frameworks/base and syncing.
|
||||
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
|
||||
endif
|
||||
# Add mini-debug-info to the boot classpath unless explicitly asked not to.
|
||||
ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
|
||||
PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
|
||||
endif
|
||||
|
||||
# Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter
|
||||
# only. b/74209329
|
||||
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
ifneq (true,$(WITH_DEXPREOPT))
|
||||
ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
|
||||
$(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Get value of a property. It is first searched from PRODUCT_VENDOR_PROPERTIES
|
||||
@@ -100,7 +85,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
|
||||
$(call add_json_bool, DisablePreopt, $(call invert_bool,$(ENABLE_PREOPT)))
|
||||
$(call add_json_bool, DisablePreoptBootImages, $(call invert_bool,$(ENABLE_PREOPT_BOOT_IMAGES)))
|
||||
$(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, OnlyPreoptArtBootImage , $(filter true,$(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY)))
|
||||
$(call add_json_bool, PreoptWithUpdatableBcp, $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP)))
|
||||
$(call add_json_bool, DontUncompressPrivAppsDex, $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))
|
||||
$(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
|
||||
|
@@ -60,17 +60,9 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR)))
|
||||
LOCAL_DEX_PREOPT :=
|
||||
endif
|
||||
|
||||
# if WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true and module is not in boot class path skip
|
||||
# Also preopt system server jars since selinux prevents system server from loading anything from
|
||||
# /data. If we don't do this they will need to be extracted which is not favorable for RAM usage
|
||||
# or performance. If my_preopt_for_extracted_apk is true, we ignore the only preopt boot image
|
||||
# options.
|
||||
system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(call word-colon,2,$(m)))
|
||||
ifneq (true,$(my_preopt_for_extracted_apk))
|
||||
ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
|
||||
ifeq ($(filter $(system_server_jars) $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)
|
||||
LOCAL_DEX_PREOPT :=
|
||||
endif
|
||||
ifeq (true,$(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY))
|
||||
LOCAL_DEX_PREOPT :=
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -226,7 +218,7 @@ endif
|
||||
# as a failure to get manifest from an APK).
|
||||
ifneq (true,$(WITH_DEXPREOPT))
|
||||
LOCAL_ENFORCE_USES_LIBRARIES := false
|
||||
else ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
|
||||
else ifeq (true,$(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY))
|
||||
LOCAL_ENFORCE_USES_LIBRARIES := false
|
||||
endif
|
||||
|
||||
|
@@ -548,7 +548,7 @@ endef
|
||||
# be cleaned up to not be product variables.
|
||||
_readonly_late_variables := \
|
||||
DEVICE_PACKAGE_OVERLAYS \
|
||||
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \
|
||||
WITH_DEXPREOPT_ART_BOOT_IMG_ONLY \
|
||||
|
||||
# Modified internally in the build system
|
||||
_readonly_late_variables += \
|
||||
|
Reference in New Issue
Block a user