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

Merge changes Id8b48c8c,I3b66304c am: ffda9a5093 am: d0aa18ed07

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

Change-Id: I64b731d3f4dc1041c016ec8d460856227bd41e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-03-24 16:54:27 +00:00
committed by Automerger Merge Worker
parent 74aebc8e55 d0aa18ed07
commit 9ee11cef7c
4 changed files with 14 additions and 24 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.
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
# ###############################################################

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
# only. b/74209329
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
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)
# 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
endif
endif
endif