From 89b802b994f94a779719532b589692dd390d9260 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 Jul 2017 19:25:47 -0700 Subject: [PATCH] Fix LOCAL_JAR_PROCESSOR dependency The LOCAL_JAR_PROCESSOR rule should depend on the path to the processor jar and not the module name. Test: m -j && m -j Change-Id: I5ebd4cd3ad4429918edfd0a8cb5cb9a4e7e86ca7 --- core/java.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java.mk b/core/java.mk index 704ab29d7..6d7173a9d 100644 --- a/core/java.mk +++ b/core/java.mk @@ -464,18 +464,21 @@ ifdef LOCAL_JAR_PROCESSOR # using deferred evaluation (LOCAL_JAR_PROCESSOR_ARGS = instead of :=). in := $(full_classes_compiled_jar) out := $(full_classes_processed_jar).tmp +my_jar_processor := $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_JAR_PROCESSOR).jar + $(full_classes_processed_jar): PRIVATE_JAR_PROCESSOR_ARGS := $(LOCAL_JAR_PROCESSOR_ARGS) -$(full_classes_processed_jar): PRIVATE_JAR_PROCESSOR := $(HOST_OUT_JAVA_LIBRARIES)/$(LOCAL_JAR_PROCESSOR).jar +$(full_classes_processed_jar): PRIVATE_JAR_PROCESSOR := $(my_jar_processor) $(full_classes_processed_jar): PRIVATE_TMP_OUT := $(out) in := out := -$(full_classes_processed_jar): $(full_classes_compiled_jar) $(LOCAL_JAR_PROCESSOR) +$(full_classes_processed_jar): $(full_classes_compiled_jar) $(my_jar_processor) @echo Processing $@ with $(PRIVATE_JAR_PROCESSOR) $(hide) rm -f $@ $(PRIVATE_TMP_OUT) $(hide) $(JAVA) -jar $(PRIVATE_JAR_PROCESSOR) $(PRIVATE_JAR_PROCESSOR_ARGS) $(hide) mv $(PRIVATE_TMP_OUT) $@ +my_jar_processor := else full_classes_processed_jar := $(full_classes_compiled_jar) endif