Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build."
This commit is contained in:
@@ -549,7 +549,10 @@ DISABLE_PREOPT :=
|
|||||||
DISABLE_PREOPT_BOOT_IMAGES :=
|
DISABLE_PREOPT_BOOT_IMAGES :=
|
||||||
ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
|
ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))
|
||||||
DISABLE_PREOPT := true
|
DISABLE_PREOPT := true
|
||||||
DISABLE_PREOPT_BOOT_IMAGES := true
|
# VSDK builds perform dexpreopt during merge_target_files build step.
|
||||||
|
ifneq (true,$(BUILDING_WITH_VSDK))
|
||||||
|
DISABLE_PREOPT_BOOT_IMAGES := true
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq (true,$(TARGET_BUILD_UNBUNDLED))
|
ifeq (true,$(TARGET_BUILD_UNBUNDLED))
|
||||||
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
|
ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
|
||||||
|
Reference in New Issue
Block a user