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

Merge changes Id8b48c8c,I3b66304c

Browse Source 
* changes:
  Build the whole platform for aosp_riscv64
  Disable dexpreopt for aosp_riscv64
This commit is contained in:
Colin Cross
2023-03-24 15:48:32 +00:00
committed by Gerrit Code Review
parent 539fbc287e c9cb74d257
commit ffda9a5093
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. # 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

21
target/product/aosp_riscv64.mk
View File

@@ -30,8 +30,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
# GSI for system/product & support 64-bit apps only # GSI for system/product & support 64-bit apps only
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
#$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
TARGET_FLATTEN_APEX := false
# #
# All components inherited here go to system_ext image # All components inherited here go to system_ext image
@@ -58,24 +57,6 @@ ifeq (aosp_riscv64,$(TARGET_PRODUCT))
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
endif endif
# TODO: this list should come via mainline_system.mk, but for now list
# just the modules that work for riscv64.
PRODUCT_PACKAGES := \
init.environ.rc \
init_first_stage \
init_system \
linker \
shell_and_utilities \
com.android.art \
com.android.conscrypt \
com.android.i18n \
com.android.runtime \
com.android.tzdata \
com.android.os.statsd \
$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk)
PRODUCT_USES_DEFAULT_ART_CONFIG := false
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
root/init.zygote64.rc root/init.zygote64.rc