Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit e325f61525ccf56ef4e4ae60b56d9626de88f5f1.
Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.
Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
diff --git a/core/board_config.mk b/core/board_config.mk
index bffaf2a..70c91a8 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -203,7 +203,7 @@
# Conditional to building on linux, as dex2oat currently does not work on darwin.
ifeq ($(HOST_OS),linux)
- WITH_DEXPREOPT ?= true
+ WITH_DEXPREOPT := true
endif
# ###############################################################
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 0bb47d1..e36e2eb 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -65,12 +65,9 @@
# 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