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

Merge "Revert "Disable dexpreopt for aosp_riscv64""

Browse Source
This commit is contained in:
Ulya Trofimovich
2023-04-03 11:31:42 +00:00
committed by Gerrit Code Review
parent 90206e3493 cc5c6a74ee
commit 1d3c4ae036
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@@ -204,10 +204,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)
# TODO(riscv64) add compiler support and enable dexpreopt on RISC-V. WITH_DEXPREOPT := true
ifneq ($(TARGET_ARCH),riscv64)
WITH_DEXPREOPT := true
endif
endif 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 # 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)))
# TODO(riscv64) add compiler support and enable dexpreopt on RISC-V. ifneq (true,$(WITH_DEXPREOPT))
ifeq (,$(filter riscv64, $(TARGET_ARCH))) ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
ifneq (true,$(WITH_DEXPREOPT)) $(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)
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,6 +26,3 @@ 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