Merge "Support 2knand images in otapackage generation and generate mar file"

patch/ics_strawberry/build/2knand-ota-package.patch → patch/ics_strawberry/build/2knand-ota-package-mar.patch

+From 663ce661395826adb21344f06805cb4c93ab6d61 Mon Sep 17 00:00:00 2001
+From: Greg Grisco <ggrisco@codeaurora.org>
+Date: Sat, 27 Apr 2013 12:18:08 -0700
+Subject: [PATCH] Support 2knand images in otapackage generation and generate
+ mar file
+
+Combined with patch to support 2knand images, this patch adds support
+for generating a mar file that contains update.zip, taking advantage
+of gecko updater for applying the fota package.
+
+Change-Id: Ie44b3f060576a6c2b782b43596fcbcc26c0b4417
+---
+ core/Makefile                            |   91 +++++++++++++++++++++++++++++-
+ core/main.mk                             |    2 +
+ tools/releasetools/common.py             |    2 +-
+ tools/releasetools/ota_from_target_files |   20 +++++--
+ 4 files changed, 108 insertions(+), 7 deletions(-)
+
 diff --git a/core/Makefile b/core/Makefile
-index 324a800..feba807 100644
+index 324a800..e67f077 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1324,6 +1324,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
+@@ -1324,6 +1324,8 @@ $(BUILT_TARGET_FILES_PACKAGE): \
  		$(built_ota_tools) \
  		$(INTERNAL_OTA_PACKAGE_TARGET) \
  		$(INTERNAL_MMC_OTA_PACKAGE_TARGET) \
 +		$(INTERNAL_2KNAND_OTA_PACKAGE_TARGET) \
++		$(INTERNAL_2KNAND_OTA_MAR_TARGET) \
  		$(APKCERTS_FILE) \
  		$(HOST_OUT_EXECUTABLES)/fs_config \
  		| $(ACP)
-@@ -1332,53 +1333,111 @@ $(BUILT_TARGET_FILES_PACKAGE): \
+@@ -1332,53 +1334,111 @@ $(BUILT_TARGET_FILES_PACKAGE): \
  	$(hide) mkdir -p $(dir $@) $(zip_root)
  	@# Components of the recovery image
  	$(hide) mkdir -p $(zip_root)/RECOVERY
@@ -122,7 +141,18 @@ index 324a800..feba807 100644
  endif
  	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
  	            mkdir -p $(zip_root)/RADIO; \
-@@ -1472,6 +1531,19 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS)
+@@ -1460,6 +1520,10 @@ else
+   fota := 0
+ endif
+ 
++MAR := $(GECKO_OBJDIR)/dist/host/bin/mar
++MAR_OBJDIR:= $(GECKO_OBJDIR)/fota_mar
++MAKE_FULL_UPDATE := $(GECKO_PATH)/tools/update-packaging/make_full_update.sh
++
+ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
+ 
+ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
+@@ -1472,6 +1536,31 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS)
             -f $(fota) \
             $(BUILT_TARGET_FILES_PACKAGE) $@
  
@@ -138,16 +168,28 @@ index 324a800..feba807 100644
 +           -k $(KEY_CERT_PAIR) \
 +           -f $(fota) \
 +           $(BUILT_TARGET_FILES_PACKAGE) $@
++
++INTERNAL_2KNAND_OTA_MAR_TARGET := $(PRODUCT_OUT)/$(name)_2knand.mar
++
++$(INTERNAL_2KNAND_OTA_MAR_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
++
++$(INTERNAL_2KNAND_OTA_MAR_TARGET): $(INTERNAL_2KNAND_OTA_PACKAGE_TARGET) $(OTATOOLS)
++	@echo "Creating fota mar file"
++	mkdir -p $(MAR_OBJDIR)
++	cp $(INTERNAL_2KNAND_OTA_PACKAGE_TARGET) $(MAR_OBJDIR)/update.zip
++	cd $(MAR_OBJDIR) && $(PYTHON) $(ANDROID_BUILD_TOP)/gecko/config/createprecomplete.py
++	MAR=$(MAR) $(MAKE_FULL_UPDATE) $@ $(MAR_OBJDIR)
++	shasum -a 512 $@
 +
  ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
  INTERNAL_MMC_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name)_mmc.zip
  else
-@@ -1490,7 +1562,7 @@ $(INTERNAL_MMC_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS)
+@@ -1490,7 +1579,7 @@ $(INTERNAL_MMC_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS)
             $(BUILT_TARGET_FILES_PACKAGE) $@
  
  .PHONY: otapackage
 -otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) $(INTERNAL_MMC_OTA_PACKAGE_TARGET)
-+otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) $(INTERNAL_MMC_OTA_PACKAGE_TARGET) $(INTERNAL_2KNAND_OTA_PACKAGE_TARGET)
++otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) $(INTERNAL_MMC_OTA_PACKAGE_TARGET) $(INTERNAL_2KNAND_OTA_PACKAGE_TARGET) $(INTERNAL_2KNAND_OTA_MAR_TARGET)
  
  # -----------------------------------------------------------------
  # The update package
@@ -229,4 +271,6 @@ index b989129..759efe9 100755
    script.ShowProgress(0.2, 0)
  
    script.ShowProgress(0.2, 10)
+-- 
+1.7.8.3