| author | Guillaume Chelfi <chelfi@google.com> | 2020-01-23 00:23:13 (GMT) |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2020-01-27 17:38:49 (GMT) |
| commit | 6c0d674b3ff1ce558974771b8ae3ef18c5f54fdd (patch) | |
| tree | 80588755b823470a15d59bb359553e2b80fb0f4e | |
| parent | 3edcf919299bd2dfbfc1436ec5fd04ba70f5f9e9 (diff) | |
| parent | c172d89a9ce963ec445c13c3b23435d537f10a71 (diff) | |
| download | common-6c0d674b3ff1ce558974771b8ae3ef18c5f54fdd.zip common-6c0d674b3ff1ce558974771b8ae3ef18c5f54fdd.tar.gz common-6c0d674b3ff1ce558974771b8ae3ef18c5f54fdd.tar.bz2 | |
resolve merge conflicts of c172d89a9ce963ec445c13c3b23435d537f10a71 to partner-master-tv-dev
Test: lunch deadpool-eng; m
Bug: None
Change-Id: I24023a06ad6e043b4dadc5bb15393dceaa233367
| -rwxr-xr-x | factory.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -732,8 +732,8 @@ endif # ifeq ($(TARGET_SUPPORT_USB_BURNING_V2),true) droidcore: $(INSTALLED_MANIFEST_XML) otapackage: otatools-package -ifeq ($(BUILD_AMLOGIC_FACTORY_ZIP), true) -droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) +ifneq ($(BUILD_AMLOGIC_FACTORY_ZIP), false) +droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_AML_FASTBOOT_ZIP) otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) endif |