diff --git a/core/definitions.mk b/core/definitions.mk index cd92848e01..6d8cddb3da 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 5021510a25..da329788e8 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -99,6 +99,7 @@ $(full_classes_compiled_jar): \ $(NORMALIZE_PATH) \ $(JAR_ARGS) \ $(ZIPSYNC) \ + $(SOONG_ZIP) \ | $(SOONG_JAVAC_WRAPPER) $(transform-host-java-to-dalvik-package) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 8998d525e4..f9abe9bc4e 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -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) diff --git a/core/java.mk b/core/java.mk index 44e005d8dc..6798efa6a2 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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))