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

Commit a5dcac76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Turn missing jarjar output files into errors"

parents 1514b9a5 a1271eb3

core/definitions.mk

+11 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,17 @@ $(hide) $(ZIPTIME) $@.tmp 
$(hide) $(call commit-change-for-toc,$@)

endef



# Runs jarjar on an input file.  Jarjar doesn't exit with a nonzero return code

# when there is a syntax error in a rules file and doesn't write the output

# file, so removes the output file before running jarjar and check if it exists

# after running jarjar.

define transform-jarjar

echo $($(PRIVATE_PREFIX)DISPLAY) JarJar: $@

rm -f $@

$(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

[ -e $@ ] || (echo "Missing output file"; exit 1)

endef



# Moves $1.tmp to $1 if necessary. This is designed to be used with

# .KATI_RESTAT. For kati, this function doesn't update the timestamp

# of $1 when $1.tmp is identical to $1 so that ninja won't rebuild

core/host_dalvik_java_library.mk

+2 −4
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ $(full_classes_turbine_jar): \ 
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_header_jarjar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_header_jarjar): $(full_classes_turbine_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo Header JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(call transform-jarjar)

else

full_classes_header_jarjar := $(full_classes_turbine_jar)

endif
@@ -149,8 +148,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(call transform-jarjar)

else

full_classes_jarjar_jar := $(full_classes_combined_jar)

endif

core/host_java_library.mk

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(call transform-jarjar)

else

full_classes_jarjar_jar := $(full_classes_combined_jar)

endif

core/java.mk

+2 −4
Original line number Diff line number Diff line
@@ -253,8 +253,7 @@ $(full_classes_turbine_jar): \ 
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_header_jarjar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_header_jarjar): $(full_classes_turbine_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo Header JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(call transform-jarjar)

else

full_classes_header_jarjar := $(full_classes_turbine_jar)

endif
@@ -334,8 +333,7 @@ endif 
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_processed_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(call transform-jarjar)

else

full_classes_jarjar_jar := $(full_classes_processed_jar)

endif