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

Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev

Browse Source 
* changes:
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."
This commit is contained in:
Andreas Gampe
2016-03-11 16:20:50 +00:00
committed by Android (Google) Code Review
parent e6e3c70b67 4df565786a
commit 6f0a902081
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/dex_preopt.mk
View File

@@ -21,12 +21,13 @@ DEX_PREOPT_DEFAULT ?= true
# The default values for pre-opting: always preopt PIC. # 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 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) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT_PIC ?= true WITH_DEXPREOPT_PIC ?= true
WITH_DEXPREOPT ?= 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
endif endif