From 09a00a672bb18dccc97af6090739ea275c39d8a3 Mon Sep 17 00:00:00 2001 From: Ying Wang <wangying@google.com> Date: Wed, 20 Oct 2010 14:01:09 -0700 Subject: Don't build update zip package if there is no kernel, or it's generic device. Move the update package code block forward to be side by side with the ota package code, so that they are built under the same condition. Bug: 3116070 Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee --- core/Makefile | 67 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/core/Makefile b/core/Makefile index 51f98ad..a74f855 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1015,14 +1015,15 @@ endif target-files-package: $(BUILT_TARGET_FILES_PACKAGE) -# ----------------------------------------------------------------- -# OTA update package ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_PRODUCT),sdk) ifneq ($(TARGET_DEVICE),generic) ifneq ($(TARGET_NO_KERNEL),true) +# ----------------------------------------------------------------- +# OTA update package + name := $(TARGET_PRODUCT) ifeq ($(TARGET_BUILD_TYPE),debug) name := $(name)_debug @@ -1043,6 +1044,34 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS) .PHONY: otapackage otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) +# ----------------------------------------------------------------- +# The update package + +name := $(TARGET_PRODUCT) +ifeq ($(TARGET_BUILD_TYPE),debug) + name := $(name)_debug +endif +name := $(name)-img-$(FILE_NAME_TAG) + +INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip + +ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),) +# default to common dir for device vendor +$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_DEVICE_DIR)/../common +else +$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) +endif + +$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS) + @echo "Package: $@" + $(hide) ./build/tools/releasetools/img_from_target_files -v \ + -s $(extensions) \ + -p $(HOST_OUT) \ + $(BUILT_TARGET_FILES_PACKAGE) $@ + +.PHONY: updatepackage +updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET) + endif # TARGET_NO_KERNEL != true endif # TARGET_DEVICE != generic endif # TARGET_PRODUCT != sdk @@ -1170,40 +1199,6 @@ endif # TARGET_SIMULATOR != true dalvikfiles: $(INTERNAL_DALVIK_MODULES) # ----------------------------------------------------------------- -# The update package - -ifneq ($(TARGET_SIMULATOR),true) -ifneq ($(TARGET_PRODUCT),sdk) - -name := $(TARGET_PRODUCT) -ifeq ($(TARGET_BUILD_TYPE),debug) - name := $(name)_debug -endif -name := $(name)-img-$(FILE_NAME_TAG) - -INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip - -ifeq ($(TARGET_RELEASETOOLS_EXTENSIONS),) -# default to common dir for device vendor -$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_DEVICE_DIR)/../common -else -$(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) -endif - -$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS) - @echo "Package: $@" - $(hide) ./build/tools/releasetools/img_from_target_files -v \ - -s $(extensions) \ - -p $(HOST_OUT) \ - $(BUILT_TARGET_FILES_PACKAGE) $@ - -.PHONY: updatepackage -updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET) - -endif # TARGET_PRODUCT != sdk -endif # TARGET_SIMULATOR != true - -# ----------------------------------------------------------------- # The emulator package ifneq ($(TARGET_SIMULATOR),true) -- cgit v1.1