Merge "For emulator builds preopt system apps even if doing eng build" am: 6dfd788fda

am: cb3991d670

Change-Id: I5badbfee38017df25cffcf3b93b17107ec50344a
This commit is contained in:
Dan Willemsen 2016-10-19 18:11:35 +00:00 committed by android-build-merger
commit 178d8647e1
7 changed files with 7 additions and 0 deletions

View File

@ -35,6 +35,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false
endif
endif

View File

@ -65,6 +65,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false
endif
endif

View File

@ -42,6 +42,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false
endif
endif

View File

@ -57,6 +57,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false
endif
endif

View File

@ -22,6 +22,7 @@ USE_CAMERA_STUB := true
# of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT ?= true
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false
endif
# Build OpenGLES emulation host and guest libraries

View File

@ -28,6 +28,7 @@ USE_CAMERA_STUB := true
# of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT ?= true
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false
endif
# Build OpenGLES emulation host and guest libraries

View File

@ -39,6 +39,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false
endif
endif