From 2b8cf0e4094f8845148a8dfe5f23c66222316f0b Mon Sep 17 00:00:00 2001 From: Erick Alvarez Date: Mon, 27 Feb 2023 20:15:01 +0000 Subject: [PATCH] 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 --- core/board_config.mk | 2 +- core/dex_preopt_config.mk | 9 +++------ target/board/generic_riscv64/BoardConfig.mk | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/core/board_config.mk b/core/board_config.mk index bffaf2a904..70c91a80b3 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -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 # ############################################################### diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 0bb47d10a3..e36e2ebb6f 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -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 diff --git a/target/board/generic_riscv64/BoardConfig.mk b/target/board/generic_riscv64/BoardConfig.mk index 53379bbb57..906f7f0cb5 100644 --- a/target/board/generic_riscv64/BoardConfig.mk +++ b/target/board/generic_riscv64/BoardConfig.mk @@ -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