summaryrefslogtreecommitdiff
authorZhigang <zhigang.yu@amlogic.com>2018-10-15 08:19:47 (GMT)
committer Can Cao <can.cao@amlogic.com>2018-10-23 08:46:02 (GMT)
commit09d46f101fbe805b38af01cc3f2fe7f29c014868 (patch)
tree40b2dae516df416c286a7973b7fa40f8e3d7e451
parent73f71f23db19529557e52e6fe44808b678c2aecb (diff)
downloadcommon-09d46f101fbe805b38af01cc3f2fe7f29c014868.zip
common-09d46f101fbe805b38af01cc3f2fe7f29c014868.tar.gz
common-09d46f101fbe805b38af01cc3f2fe7f29c014868.tar.bz2
ota: fixed incremental ota upgrade failed[1/1]
BUG=112195426 copy system.img & vendor.img for fastboot and usb burning from ota zip,so usb burning fastboot and ota has the same image. Change-Id: I6800af8813db08aa540b65d4832d48af61807149
Diffstat
-rw-r--r--factory.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/factory.mk b/factory.mk
index f6e45e5..c818f4b 100644
--- a/factory.mk
+++ b/factory.mk
@@ -314,12 +314,16 @@ aml_upgrade:$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET)
$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \
$(addprefix $(PRODUCT_OUT)/,$(BUILT_IMAGES)) \
$(UPGRADE_FILES) \
+ $(AML_TARGET).zip \
$(INSTALLED_AML_USER_IMAGES) \
$(INSTALLED_AML_LOGO) \
$(INSTALLED_MANIFEST_XML) \
$(TARGET_USB_BURNING_V2_DEPEND_MODULES)
ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
mkdir -p $(PRODUCT_UPGRADE_OUT)
+ 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
$(hide) $(foreach file,$(UPGRADE_FILES), \
echo cp $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
cp -f $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
@@ -377,8 +381,11 @@ endif
.PHONY:aml_fastboot_zip
aml_fastboot_zip:$(INSTALLED_AML_FASTBOOT_ZIP)
-$(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) $(BUILT_ODMIMAGE_TARGET)
+$(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) $(BUILT_ODMIMAGE_TARGET) $(AML_TARGET).zip
echo "install $@"
+ 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
rm -rf $(PRODUCT_OUT)/fastboot
mkdir -p $(PRODUCT_OUT)/fastboot
cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/;