author | Dmitry Shmidt <dimitrysh@google.com> | 2018-12-21 17:12:59 (GMT) |
---|---|---|
committer | chenyu.liu <chenyu.liu@amlogic.com> | 2019-01-07 01:42:44 (GMT) |
commit | 608f67d3d7a0711e8f6fc179b07d7fbe0dd11210 (patch) | |
tree | 1fd900d61a6a851438c0a8db2cf098ae7fa2a2fc | |
parent | e71e412c24df7b5c858e51a850149969fbb99941 (diff) | |
download | common-608f67d3d7a0711e8f6fc179b07d7fbe0dd11210.zip common-608f67d3d7a0711e8f6fc179b07d7fbe0dd11210.tar.gz common-608f67d3d7a0711e8f6fc179b07d7fbe0dd11210.tar.bz2 |
amlogic: Remove unnecessary main images copy to PRODUCT_OUT
Images boot.img, system.img, vendor.img and vbmeta.img are created
in PRODUCT_OUT and there is no need to copy them from AML_TARGET/IMAGES/.
Moreover it is happening in parallel with aml_image_v2_packer call
and may result in emptry boot.img:
[Msg]Pack Item[VERIFY , boot] from
(out/target/product/atom/upgrade/boot.img),Fail to get file size for
file out/target/product/atom/upgrade/boot.img, is file path right??
[ERR]f(AmlImagePack.cpp)L1409:Gen file boot.img sha1sum failed!
Image pack FAILED
Bug: 121327390
Test: Manual
Change-Id: I23703baea28fcc8597125f3adbfb037d548d3fe8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r-- | factory.mk | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -318,10 +318,6 @@ $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \ $(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 - 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)); \ @@ -381,10 +377,6 @@ endif aml_fastboot_zip:$(INSTALLED_AML_FASTBOOT_ZIP) $(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 - 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/; |