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

Commit 4ca5ad61 authored by Erick Alvarez's avatar Erick Alvarez Committed by Automerger Merge Worker
Browse files

Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 37d02732 am: e6ff3ed6 

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



Change-Id: I93c17dc9e2d0b7a0ec24433858c2d7d76701ada7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cb1cd1e e6ff3ed6

core/board_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ _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

  WITH_DEXPREOPT := true

endif



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

core/dex_preopt_config.mk

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

+0 −3
Original line number Diff line number Diff line
@@ -26,6 +26,3 @@ 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