summaryrefslogtreecommitdiff
authorDmitry Shmidt <dimitrysh@google.com>2019-08-15 17:31:10 (GMT)
committer Dmitry Shmidt <dimitrysh@google.com>2019-08-15 17:40:22 (GMT)
commit5ba2f91c6697b750bb3fb17ce5e3f81a6a89f98b (patch)
treea8be6b2c477fe3446d7a6a5ae881e6ca28c52796
parent7c981ba4698cf902fe9397db71fca5b941889459 (diff)
downloadcommon-5ba2f91c6697b750bb3fb17ce5e3f81a6a89f98b.zip
common-5ba2f91c6697b750bb3fb17ce5e3f81a6a89f98b.tar.gz
common-5ba2f91c6697b750bb3fb17ce5e3f81a6a89f98b.tar.bz2
amlogic: Remove unnecessary reference to undefined $TOP
FAILED: out/target/product/atom/aml_upgrade_package-5804453.img cp boot.img out/target/product/atom/boot.img out/target/product/atom/upgrade/boot.img cp: not writing through dangling symlink ‘out/target/product/atom/upgrade/boot.img’ cp recovery.img out/target/product/atom/recovery.img out/target/product/atom/upgrade/recovery.img cp: not writing through dangling symlink ‘out/target/product/atom/upgrade/recovery.img’ Bug: 139479313 Test: make -j24 Change-Id: I12a6d8bec418bec3ba893a975eb8bcdd7bc03411 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat
-rw-r--r--factory.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/factory.mk b/factory.mk
index 57907b1..6de17d6 100644
--- a/factory.mk
+++ b/factory.mk
@@ -256,7 +256,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 $(TOP)/$(PRODUCT_OUT)/$(1).img $(PRODUCT_UPGRADE_OUT)/$(1).img && \
+ ln -sf $(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
@@ -349,8 +349,8 @@ ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
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 $(TOP)/$(PRODUCT_OUT)/dt.img $(PRODUCT_UPGRADE_OUT)/dt.img
- ln -sf $(TOP)/$(PRODUCT_OUT)/bootloader.img.encrypt.efuse $(PRODUCT_UPGRADE_OUT)/SECURE_BOOT_SET
+ 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
endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
$(security_dm_verity_conf)
$(update-aml_upgrade-conf)