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

Commit 9b36317b authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android (Google) Code Review
Browse files

Merge "Add proper deps for jarjar rules files."

parents 12e560eb d919c7a3

core/host_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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