Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd2d0247 authored by Ying Wang's avatar Ying Wang
Browse files

Don't build otatools.zip if we don't build the ota package. 

Also added flag TARGET_SKIP_OTA_PACKAGE to allow product to skip ota
package.

Bug: 24295339
Change-Id: Ib613ed747528661a6572b577cd54ccb6c2d1fdc8
parent 9ff24387

core/Makefile

+25 −20
Original line number Diff line number Diff line
@@ -1292,6 +1292,30 @@ endif 
# -----------------------------------------------------------------

# 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 \

  $(HOST_OUT_EXECUTABLES)/aapt \

  $(HOST_OUT_EXECUTABLES)/mkbootfs \
@@ -1350,6 +1374,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP) 
.PHONY: otatools-package

otatools-package: $(BUILT_OTATOOLS_PACKAGE)



endif # build_ota_package



# -----------------------------------------------------------------

# A zip of the directories that map to the target filesystem.
@@ -1561,26 +1586,6 @@ ifneq ($(filter $(MAKECMDGOALS),target-files-package),) 
$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))

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)

# -----------------------------------------------------------------

# OTA update package