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

Commit 4c9b891a authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev am: 6f0a9020 

am: 63e5a868

* commit '63e5a868':
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."
parents 638ee4bd 63e5a868

core/dex_preopt.mk

+7 −6
Original line number Diff line number Diff line
@@ -21,12 +21,13 @@ DEX_PREOPT_DEFAULT ?= true 


# The default values for pre-opting: always preopt PIC.

# Conditional to building on linux, as dex2oat currently does not work on darwin.

# Conditional to building a non-eng build, as it currently negatively affects

# some development workflows.

ifneq ($(TARGET_BUILD_VARIANT),eng)

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT_PIC ?= true

  WITH_DEXPREOPT ?= true

# For an eng build only pre-opt the boot image. This gives reasonable performance and still

# allows a simple workflow: building in frameworks/base and syncing.

  ifeq (eng,$(TARGET_BUILD_VARIANT))

    WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true

  endif

endif