From 138768c1bbb49d549c4b14281fa5f0bffac7d933 Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Mon, 15 Dec 2014 16:25:14 +0100
Subject: [PATCH] Remove some useless depencies

... from dexes to jars. This should allow to build less jars when
building dex files with Jack and Jill.

Change-Id: Ib3a717251e3bec3cc73564c205eb908ba1ef380f
---
 core/java.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java.mk b/core/java.mk
index 9de9bcb2c..9e159fb20 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -500,7 +500,7 @@ $(full_classes_proguard_jar) : $(full_classes_jar)
 
 endif # LOCAL_PROGUARD_ENABLED defined
 
-
+ifneq ($(strip $(LOCAL_USE_JACK)),true)
 # Override PRIVATE_INTERMEDIATES_DIR so that install-dex-debug
 # will work even when intermediates != intermediates.COMMON.
 $(built_dex_intermediate): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)
@@ -516,6 +516,7 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals
 endif
 $(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)
 	$(transform-classes.jar-to-dex)
+endif # !LOCAL_USE_JACK
 
 $(built_dex): $(built_dex_intermediate) | $(ACP)
 	@echo Copying: $@