commit 27efd6e1ebf74a245a0b3f4c7b532e8e4922f817
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 23 12:44:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 12:44:10 2023 +0000
tree 7a13a907d761acb6be895ac71825a79723becb3f
parent 2231df8a5494cf4bada8cf8158c57f46a40e9e48
parent 7e00234b847b802d26d8080c56e3f2ad2bd45ad5

Merge "Fix build error about jar manifest"

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 8e063d0..d45da48 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -98,7 +98,7 @@
 $(full_classes_combined_jar): $(full_classes_compiled_jar) \
                               $(jar_manifest_file) \
                               $(full_static_java_libs) | $(MERGE_ZIPS)
-	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \
+	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(PRIVATE_JAR_MANIFEST)) \
             $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \
             $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)
 

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 6d8f237..842fcbf 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -296,7 +296,7 @@
 $(full_classes_combined_jar): $(full_classes_compiled_jar) \
                               $(jar_manifest_file) \
                               $(full_static_java_libs) | $(MERGE_ZIPS)
-	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \
+	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(PRIVATE_JAR_MANIFEST)) \
             $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \
             $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)