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

am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."

Browse Source 
* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.
This commit is contained in:
Ying Wang
2015-09-22 18:56:57 +00:00
committed by Android Git Automerger
parent 8c33b95205 d6679fbc7e
commit f0f8bc2118
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/Makefile
View File

@@ -1321,6 +1321,30 @@ endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# host tools needed to build dist and OTA packages # host tools needed to build dist and OTA packages
build_ota_package := true
ifeq ($(TARGET_SKIP_OTA_PACKAGE),true)
build_ota_package := false
endif
ifeq ($(BUILD_OS),darwin)
build_ota_package := false
endif
ifneq ($(strip $(SANITIZE_TARGET)),)
build_ota_package := false
endif
ifeq ($(TARGET_PRODUCT),sdk)
build_ota_package := false
endif
ifneq ($(filter generic%,$(TARGET_DEVICE)),)
build_ota_package := false
endif
ifeq ($(TARGET_NO_KERNEL),true)
build_ota_package := false
endif
ifeq ($(recovery_fstab),)
build_ota_package := false
endif
ifeq ($(build_ota_package),true)
OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/aapt \ $(HOST_OUT_EXECUTABLES)/aapt \
$(HOST_OUT_EXECUTABLES)/mkbootfs \ $(HOST_OUT_EXECUTABLES)/mkbootfs \
@@ -1379,6 +1403,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP)
.PHONY: otatools-package .PHONY: otatools-package
otatools-package: $(BUILT_OTATOOLS_PACKAGE) otatools-package: $(BUILT_OTATOOLS_PACKAGE)
endif # build_ota_package
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# A zip of the directories that map to the target filesystem. # A zip of the directories that map to the target filesystem.
@@ -1590,26 +1615,6 @@ ifneq ($(filter $(MAKECMDGOALS),target-files-package),)
$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE)) $(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))
endif endif
build_ota_package := true
ifeq ($(BUILD_OS),darwin)
build_ota_package := false
endif
ifneq ($(strip $(SANITIZE_TARGET)),)
build_ota_package := false
endif
ifeq ($(TARGET_PRODUCT),sdk)
build_ota_package := false
endif
ifneq ($(filter generic%,$(TARGET_DEVICE)),)
build_ota_package := false
endif
ifeq ($(TARGET_NO_KERNEL),true)
build_ota_package := false
endif
ifeq ($(recovery_fstab),)
build_ota_package := false
endif
ifeq ($(build_ota_package),true) ifeq ($(build_ota_package),true)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# OTA update package # OTA update package