Revert "Disable dexpreopt for aosp_riscv64"

This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
This commit is contained in:
Erick Alvarez
2023-02-27 20:15:01 +00:00
parent e325f61525
commit 2b8cf0e409
3 changed files with 4 additions and 10 deletions

View File

@@ -203,7 +203,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
# ###############################################################

View File

@@ -65,12 +65,9 @@ ifeq ($(HOST_OS),linux)
# 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)))
# TODO(riscv64) add compiler support and enable dexpreopt on RISC-V.
ifeq (,$(filter riscv64, $(TARGET_ARCH)))
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
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

View File

@@ -26,6 +26,3 @@ include build/make/target/board/BoardConfigGsiCommon.mk
# Temporary hack while prebuilt modules are missing riscv64.
ALLOW_MISSING_DEPENDENCIES := true
# Temporary until dex2oat works when targeting riscv64
WITH_DEXPREOPT := false