summaryrefslogtreecommitdiff
authorDaniel Cardenas <DanielCar@google.com>2018-10-04 07:09:02 (GMT)
committer Daniel Cardenas <DanielCar@google.com>2018-10-04 17:08:17 (GMT)
commit16b96f2a3f87484d4f1995c7bf892b456eb015db (patch)
tree66c3d605c0874bb2b6143225ef7494ae16fc4751
parente1841f9472e3c9db4b83da099a4120d1f8ac0d6a (diff)
downloadcommon-16b96f2a3f87484d4f1995c7bf892b456eb015db.zip
common-16b96f2a3f87484d4f1995c7bf892b456eb015db.tar.gz
common-16b96f2a3f87484d4f1995c7bf892b456eb015db.tar.bz2
Fix for fastboot not being built on fast build option
Previous CL broke it: ag/1155102 Fixes: 116865597 Fixes: 113183365 Test: Build. Make sure desired targets are built on fast build option Change-Id: I1371dfe2a41774e45eb9646b0ecbd21940d01761
Diffstat
-rw-r--r--factory.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/factory.mk b/factory.mk
index 5cee1e9..f6e45e5 100644
--- a/factory.mk
+++ b/factory.mk
@@ -309,7 +309,6 @@ define aml-secureboot-sign-bin
endef #define aml-secureboot-sign-bin
endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
-ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
.PHONY:aml_upgrade
aml_upgrade:$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET)
$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \
@@ -319,6 +318,7 @@ $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \
$(INSTALLED_AML_LOGO) \
$(INSTALLED_MANIFEST_XML) \
$(TARGET_USB_BURNING_V2_DEPEND_MODULES)
+ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
mkdir -p $(PRODUCT_UPGRADE_OUT)
$(hide) $(foreach file,$(UPGRADE_FILES), \
echo cp $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
@@ -507,7 +507,7 @@ endif
ifeq ($(NO_AMLOGIC_FACTORY_ZIP),)
.PHONY: ota_amlogic
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
+droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP)