| author | Dmitry Shmidt <dimitrysh@google.com> | 2019-08-15 23:27:57 (GMT) |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2019-08-16 19:50:48 (GMT) |
| commit | bb9be9e4eabb4d66ec6d2b4d73a0884b1fb007bf (patch) | |
| tree | 22c0b245fbeffcebbac430eba0c9438c54a94803 | |
| parent | 5ba2f91c6697b750bb3fb17ce5e3f81a6a89f98b (diff) | |
| download | common-bb9be9e4eabb4d66ec6d2b4d73a0884b1fb007bf.zip common-bb9be9e4eabb4d66ec6d2b4d73a0884b1fb007bf.tar.gz common-bb9be9e4eabb4d66ec6d2b4d73a0884b1fb007bf.tar.bz2 | |
amlogic: Remove copy to out/ and link from out/
It was added in "OTA: add odm/product to Incremental ota zip"
Bug: 139479313
Test: make dist -j24
Change-Id: I2c463cf24c45e784e861b98c8a672e4b48f0c4c2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | factory.mk | 20 |
1 files changed, 5 insertions, 15 deletions
@@ -9,8 +9,6 @@ else BUILT_IMAGES := boot.img recovery.img bootloader.img dt.img endif -VB_CHECK_IMAGES := vendor.img system.img vbmeta.img boot.img product.img recovery.img - ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) BUILT_IMAGES := $(addsuffix .encrypt, $(BUILT_IMAGES)) endif#ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) @@ -256,7 +254,7 @@ $(foreach userPartName, $(BOARD_USER_PARTS_NAME), \ $(eval $(call aml-mk-user-img-template, $(userPartName),$(PRODUCT_OUT)/$(userPartName).img))) define aml-user-img-update-pkg - ln -sf $(PRODUCT_OUT)/$(1).img $(PRODUCT_UPGRADE_OUT)/$(1).img && \ + cp $(PRODUCT_OUT)/$(1).img $(PRODUCT_UPGRADE_OUT)/$(1).img && \ sed -i "/file=\"$(1)\.img\"/d" $(2) && \ echo -e "file=\"$(1).img\"\t\tmain_type=\"PARTITION\"\t\tsub_type=\"$(1)\"" >> $(2) ; endef @@ -337,20 +335,15 @@ ifeq ($(NO_AMLOGIC_FACTORY_ZIP),) cp -f $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \ ) $(hide) $(foreach file,$(BUILT_IMAGES), \ - echo cp $(file) $(PRODUCT_OUT)/$(file) $(PRODUCT_UPGRADE_OUT)/$(file); \ - cp -f $(PRODUCT_OUT)/$(file) $(PRODUCT_UPGRADE_OUT)/$(file); \ + echo cp -f $(file) $(PRODUCT_OUT)/$(file) $(PRODUCT_UPGRADE_OUT)/$(file); \ + cp --remove-destination $(PRODUCT_OUT)/$(file) $(PRODUCT_UPGRADE_OUT)/$(file); \ ) @echo $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) - $(hide) $(foreach file,$(VB_CHECK_IMAGES), \ - rm $(PRODUCT_UPGRADE_OUT)/$(file);\ - ln -sf $(shell readlink -f $(AML_TARGET)/IMAGES/$(file)) $(PRODUCT_UPGRADE_OUT)/$(file); \ - cp -f $(AML_TARGET)/IMAGES/$(file) $(PRODUCT_OUT)/$(file); \ - ) ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) $(hide) rm -f $(PRODUCT_UPGRADE_OUT)/bootloader.img.encrypt.* $(hide) $(ACP) $(PRODUCT_OUT)/bootloader.img.encrypt.* $(PRODUCT_UPGRADE_OUT)/ - ln -sf $(PRODUCT_OUT)/dt.img $(PRODUCT_UPGRADE_OUT)/dt.img - ln -sf $(PRODUCT_OUT)/bootloader.img.encrypt.efuse $(PRODUCT_UPGRADE_OUT)/SECURE_BOOT_SET + cp $(PRODUCT_OUT)/dt.img $(PRODUCT_UPGRADE_OUT)/dt.img + cp $(PRODUCT_OUT)/bootloader.img.encrypt.efuse $(PRODUCT_UPGRADE_OUT)/SECURE_BOOT_SET endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) $(security_dm_verity_conf) $(update-aml_upgrade-conf) @@ -402,9 +395,6 @@ $(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) $ echo "install $@" rm -rf $(PRODUCT_OUT)/fastboot mkdir -p $(PRODUCT_OUT)/fastboot - $(hide) $(foreach file,$(VB_CHECK_IMAGES), \ - cp -f $(AML_TARGET)/IMAGES/$(file) $(PRODUCT_OUT)/$(file); \ - ) cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/; ifeq ($(TARGET_PRODUCT),ampere) echo "board=p212" > $(PRODUCT_OUT)/fastboot/android-info.txt |