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

Commit 7d61116c authored by Kousik Kumar's avatar Kousik Kumar
Browse files

Use soong_zip instead of jar to generate .jar files in javac actions 

This is to make the jar-output deterministic so that we can get
cache-hits for r8/d8 actions from RBE.

Change-Id: I911ee702fa5dabfe7122e82b21f78c811a0c960d
Test: m droid checkbuild
parent 1bc7f643

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2093,7 +2093,7 @@ $(if $(PRIVATE_JAR_PACKAGES), \ 
$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) rm -rf \

    $(foreach pkg, $(PRIVATE_JAR_EXCLUDE_PACKAGES), \

        $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))))

$(hide) $(JAR) -cf $@ $(call jar-args-sorted-files-in-directory,$(PRIVATE_CLASS_INTERMEDIATES_DIR))

$(hide) $(SOONG_ZIP) -jar -o $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) -D $(PRIVATE_CLASS_INTERMEDIATES_DIR)

$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))

endef

core/host_dalvik_java_library.mk

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ $(full_classes_compiled_jar): \ 
    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPSYNC) \

    $(SOONG_ZIP) \

    | $(SOONG_JAVAC_WRAPPER)

	$(transform-host-java-to-dalvik-package)

core/host_java_library.mk

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ $(full_classes_compiled_jar): \ 
    $(ZIPTIME) \

    $(JAR_ARGS) \

    $(ZIPSYNC) \

    $(SOONG_ZIP) \

    | $(SOONG_JAVAC_WRAPPER)

	$(transform-host-java-to-package)

	$(remove-timestamps-from-package)

core/java.mk

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ $(full_classes_compiled_jar): \ 
    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPSYNC) \

    $(SOONG_ZIP) \

    | $(SOONG_JAVAC_WRAPPER)

	@echo "Target Java: $@

	$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))