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

Disable dexpreopt for aosp_riscv64

Browse Source 
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
This commit is contained in:
Colin Cross
2023-02-21 11:38:30 -08:00
parent 26737b6bf3
commit ae7f543b7c
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@@ -204,7 +204,10 @@ _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 # TODO(riscv64) add compiler support and enable dexpreopt on RISC-V.
ifneq ($(TARGET_ARCH),riscv64)
WITH_DEXPREOPT := true
endif
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