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

am: 178d8647e1

Change-Id: I3a0938d14708568f21cdc3eb7eeb6d741b24e570

target/board/generic/BoardConfig.mk

@@ -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
 

target/board/generic_arm64/BoardConfig.mk

@@ -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
 

target/board/generic_mips/BoardConfig.mk

@@ -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
 

target/board/generic_mips64/BoardConfig.mk

@@ -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
 

target/board/generic_x86/BoardConfig.mk

@@ -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

target/board/generic_x86_64/BoardConfig.mk

@@ -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

target/board/generic_x86_arm/BoardConfig.mk

@@ -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