Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453fcba2 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625f 

am: 06f8dec6

Change-Id: I348fda356863ef77e166782a666233239c1bde32
parents 4e3bdda4 06f8dec6

core/java.mk

+5 −2
Original line number Diff line number Diff line
@@ -468,18 +468,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