ota: fixed incremental ota upgrade failed[1/1]

BUG=112195426

copy system.img & vendor.img & boot.img & vbmeta.img for
fastboot and usb burning from ota zip,so usb burning
fastboot and ota has the same image.

Change-Id: I96ad8da7da5f840562962ae4e8b13f4ebef58d4a
Signed-off-by: Can Cao <can.cao@amlogic.com>

2 files changed, 8 insertions, 3 deletions

diff --git a/factory.mk b/factory.mk
index c818f4b..2d9fc2a 100644
--- a/factory.mk
+++ b/factory.mk
@@ -324,6 +324,7 @@ ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
 	cp $(AML_TARGET)/IMAGES/system.img $(PRODUCT_OUT)/system.img
 	cp $(AML_TARGET)/IMAGES/vendor.img $(PRODUCT_OUT)/vendor.img
 	cp $(AML_TARGET)/IMAGES/vbmeta.img $(PRODUCT_OUT)/vbmeta.img
+	cp $(AML_TARGET)/IMAGES/boot.img $(PRODUCT_OUT)/boot.img
 	$(hide) $(foreach file,$(UPGRADE_FILES), \
 		echo cp $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
 		cp -f $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
@@ -386,6 +387,7 @@ $(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) $
 	cp $(AML_TARGET)/IMAGES/system.img $(PRODUCT_OUT)/system.img
 	cp $(AML_TARGET)/IMAGES/vendor.img $(PRODUCT_OUT)/vendor.img
 	cp $(AML_TARGET)/IMAGES/vbmeta.img $(PRODUCT_OUT)/vbmeta.img
+	cp $(AML_TARGET)/IMAGES/boot.img $(PRODUCT_OUT)/boot.img
 	rm -rf $(PRODUCT_OUT)/fastboot
 	mkdir -p $(PRODUCT_OUT)/fastboot
 	cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/;
diff --git a/releasetools.py b/releasetools.py
index 17582fe..5eca124 100755
--- a/releasetools.py
+++ b/releasetools.py
@@ -282,7 +282,7 @@ def IncrementalOTA_InstallBegin(info):
 def IncrementalOTA_ImageCheck(info, name):
   source_image = False; target_image = False; updating_image = False;
 
-  image_path = name.upper() + "/" + name
+  image_path = "IMAGES/" + name + ".img"
   image_name = name + ".img"
 
   if HasTargetImage(info.source_zip, image_path):
@@ -301,7 +301,7 @@ def IncrementalOTA_ImageCheck(info, name):
     message_process = "install " + name + " image..."
     info.script.Print(message_process);
     common.ZipWriteStr(info.output_zip, image_name, target_image.data)
-    if name == "dtb":
+    if name == "dt":
       info.script.WriteDtbImage(image_name)
     else:
       info.script.WriteRawImage("/" + name, image_name)
@@ -316,5 +316,8 @@ def IncrementalOTA_ImageCheck(info, name):
 def IncrementalOTA_InstallEnd(info):
   print "amlogic extensions:IncrementalOTA_InstallEnd"
   IncrementalOTA_ImageCheck(info, "logo");
-  IncrementalOTA_ImageCheck(info, "dtb");
+  IncrementalOTA_ImageCheck(info, "dt");
+  IncrementalOTA_ImageCheck(info, "recovery");
+  IncrementalOTA_ImageCheck(info, "vbmeta");
+  info.script.FormatPartition("/metadata")
   IncrementalOTA_ImageCheck(info, "bootloader");