| author | Daniel Cardenas <DanielCar@google.com> | 2018-10-03 22:26:38 (GMT) |
|---|---|---|
| committer | Daniel Cardenas <DanielCar@google.com> | 2018-10-03 22:28:37 (GMT) |
| commit | e1841f9472e3c9db4b83da099a4120d1f8ac0d6a (patch) | |
| tree | 5c48572176a8822a0ecec08f452078e19bb5024a | |
| parent | d444b9ac06b6a2d62b22acf8e4b151e2c8807049 (diff) | |
| download | common-e1841f9472e3c9db4b83da099a4120d1f8ac0d6a.zip common-e1841f9472e3c9db4b83da099a4120d1f8ac0d6a.tar.gz common-e1841f9472e3c9db4b83da099a4120d1f8ac0d6a.tar.bz2 | |
Fix for not build OTA if not desired
Previous CL, pa/1153947 , had an error that had OTA package built anyways.
Bug: 116865597
Bug: 113183365
Test: Build. Make sure non desired targets are not build.
Change-Id: I0691769beeb33e42593ed5c386548a0e56b495f5
| -rw-r--r-- | factory.mk | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -311,8 +311,6 @@ endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) ifeq ($(NO_AMLOGIC_FACTORY_ZIP),) .PHONY:aml_upgrade -# If target is desired occasionally then can be built with command: make aml_upgrade -endif aml_upgrade:$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \ $(addprefix $(PRODUCT_OUT)/,$(BUILT_IMAGES)) \ @@ -347,6 +345,7 @@ endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) ./$(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/aml_image_v2_packer -r \ $(PACKAGE_CONFIG_FILE) $(PRODUCT_UPGRADE_OUT)/ $@ @echo " $@ installed" +endif # ifeq ($(NO_AMLOGIC_FACTORY_ZIP),) else #none INSTALLED_AML_UPGRADE_PACKAGE_TARGET := @@ -507,10 +506,8 @@ endif ifeq ($(NO_AMLOGIC_FACTORY_ZIP),) .PHONY: ota_amlogic -# If target is desired occasionally then can be built with command: make ota_amlogic -endif ota_amlogic: $(AMLOGIC_OTA_PACKAGE_TARGET) - droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) ota_amlogic ota_amlogic: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) +endif |