StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d0273275 am: e6ff3ed647 am: 4ca5ad6121

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

Change-Id: I5ed358d2bbf749cb3e961c2713c3db68f602bcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Erick Alvarez
2023-02-28 00:51:35 +00:00
committed by Automerger Merge Worker
parent 423f9c4bb8 4ca5ad6121
commit 96791aa830
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/board_config.mk
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
# ###############################################################

9
core/dex_preopt_config.mk
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