From 5eb88c01123d309e12b401a9ffe950e5832349f5 Mon Sep 17 00:00:00 2001
From: Alan Leung <acleung@google.com>
Date: Wed, 20 Dec 2017 20:03:58 -0800
Subject: [PATCH] Add zip2zip as dependency of dexing step.

Bug: 69329508
Test: m checkbuild
Change-Id: I85f4508b6b1fee357d296bda6f0b6ba02cba70b7
---
 core/host_dalvik_java_library.mk | 2 +-
 core/java.mk                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk
index 4b12bfe72..1ff9b91f3 100644
--- a/core/host_dalvik_java_library.mk
+++ b/core/host_dalvik_java_library.mk
@@ -176,7 +176,7 @@ $(LOCAL_BUILT_MODULE) : $(full_classes_jar)
 else # !LOCAL_IS_STATIC_JAVA_LIBRARY
 $(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)
 $(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
-$(built_dex): $(full_classes_desugar_jar) $(DX)
+$(built_dex): $(full_classes_desugar_jar) $(DX) $(ZIP2ZIP)
 ifneq ($(USE_D8_DESUGAR),true)
 	$(transform-classes.jar-to-dex)
 else
diff --git a/core/java.mk b/core/java.mk
index 08e403510..dda4a3219 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -777,7 +777,7 @@ endif # USE_R8
 endif # LOCAL_PROGUARD_ENABLED
 
 ifndef my_r8
-$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)
+$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX) $(ZIP2ZIP)
 ifneq ($(USE_D8_DESUGAR),true)
 	$(transform-classes.jar-to-dex)
 else