From d919c7a3146bdf5f98bc0a4b6c436a93fcbfa7d6 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Tue, 4 Jun 2013 16:48:13 +0100 Subject: [PATCH] Add proper deps for jarjar rules files. Changes to the jarjar rules file for a module were not causing rebuilds; add the missing dependency. Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f --- core/host_java_library.mk | 2 +- core/java.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index cda6e1020..abfce6bbb 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -76,7 +76,7 @@ $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_ja # Run jarjar if necessary, otherwise just copy the file. ifneq ($(strip $(LOCAL_JARJAR_RULES)),) $(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) -$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(JARJAR) +$(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR) @echo JarJar: $@ $(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ else diff --git a/core/java.mk b/core/java.mk index f43bf3b25..5315cccdf 100644 --- a/core/java.mk +++ b/core/java.mk @@ -348,7 +348,7 @@ $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g # Run jarjar if necessary, otherwise just copy the file. ifneq ($(strip $(LOCAL_JARJAR_RULES)),) $(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) -$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(JARJAR) +$(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR) @echo JarJar: $@ $(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ else -- 2.11.0