commit 49ccbb372905be7ffa74be6f6173a9b845f5cad4
author Yifan Hong <elsk@google.com> Fri Oct 09 18:06:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 09 18:06:43 2020 +0000
tree 4540d934b5fa0494130f2151a29f1762351843f7
parent 9b7cce9417f7db84559114a95e1d1a264d00b79e
parent 5c1b199b87dad22be432c2a6ca854663f11a5e02

Merge "Build otatools files before building OTA packages."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 48ba059..b28a87d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4773,7 +4773,7 @@
 
 $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
 $(INTERNAL_OTA_PACKAGE_TARGET): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_OTA_METADATA)
-$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES)
+$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTA_FROM_TARGET_FILES) $(INTERNAL_OTATOOLS_FILES)
 	@echo "Package OTA: $@"
 	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --output_metadata_path $(INTERNAL_OTA_METADATA))
 
@@ -4791,7 +4791,8 @@
 $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
 $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): \
     $(BUILT_TARGET_FILES_PACKAGE) \
-    $(OTA_FROM_TARGET_FILES)
+    $(OTA_FROM_TARGET_FILES) \
+    $(INTERNAL_OTATOOLS_FILES)
 	@echo "Package OTA (retrofit dynamic partitions): $@"
 	$(call build-ota-package-target,$@,-k $(KEY_CERT_PAIR) --retrofit_dynamic_partitions)