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

Merge "Disable dexpreopt for aosp_riscv64" am: ee254eca0f am: 18a94331ca

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

Change-Id: I1e16b1c36dd81900f8a7dc9b1c1130ef77cddbde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ulya Trofimovich
2023-02-27 12:51:27 +00:00
committed by Automerger Merge Worker
parent 32420bb8e1 18a94331ca
commit 0b41384361
3 changed files with 10 additions and 4 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. # Conditional to building on linux, as dex2oat currently does not work on darwin.
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT ?= true
endif endif
# ############################################################### # ###############################################################

9
core/dex_preopt_config.mk
View File

@@ -65,9 +65,12 @@ ifeq ($(HOST_OS),linux)
# Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter # Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter
# only. b/74209329 # only. b/74209329
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT))) ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
ifneq (true,$(WITH_DEXPREOPT)) # TODO(riscv64) add compiler support and enable dexpreopt on RISC-V.
ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)) ifeq (,$(filter riscv64, $(TARGET_ARCH)))
$(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds) 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 endif
endif endif

3
target/board/generic_riscv64/BoardConfig.mk
View File

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