Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0aa18ed authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes Id8b48c8c,I3b66304c am: ffda9a50 

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



Change-Id: I702df2723f947b6259d08d28009596ec4cf2ed4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a678d06 ffda9a50

core/board_config.mk

+4 −1
Original line number Diff line number Diff line
@@ -204,8 +204,11 @@ _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)

  # TODO(riscv64) add compiler support and enable dexpreopt on RISC-V.

  ifneq ($(TARGET_ARCH),riscv64)

    WITH_DEXPREOPT := true

  endif

endif



# ###############################################################

# Broken build defaults

core/dex_preopt_config.mk

+6 −3
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 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)))

    # 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)
@@ -72,6 +74,7 @@ ifeq ($(HOST_OS),linux) 
      endif

    endif

  endif

endif



# Get value of a property. It is first searched from PRODUCT_VENDOR_PROPERTIES

# and then falls back to PRODUCT_SYSTEM_PROPERTIES

target/board/generic_riscv64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -26,3 +26,6 @@ include build/make/target/board/BoardConfigGsiCommon.mk 


# Temporary hack while prebuilt modules are missing riscv64.

ALLOW_MISSING_DEPENDENCIES := true



# Temporary until dex2oat works when targeting riscv64

WITH_DEXPREOPT := false

target/product/aosp_riscv64.mk

+1 −20
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true 


# 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/mainline_system.mk)

TARGET_FLATTEN_APEX := false

$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)



#

# 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)

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 += \

    root/init.zygote64.rc