From 7e00234b847b802d26d8080c56e3f2ad2bd45ad5 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Tue, 23 May 2023 13:56:35 +0900 Subject: [PATCH] Fix build error about jar manifest It still depended on old intermediate files (out/host/common/obj/JAVA_LIBRARIES/_intermediates//manifest.mf) But the intermediate manifest.mf isn't created after aosp/2563995, it causes merge_zip error due to missing file. So make it use the manifest file from source directly. Test: m out/host/common/obj/JAVA_LIBRARIES/ahat-tests_intermediates/classes-combined.jar Bug: 278060169 Bug: 283821744 Bug: 283903672 Change-Id: Iebff6bf90b93dab693aef2492383cd3b03f239fb --- core/host_java_library.mk | 2 +- core/java.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 8e063d0ae3..d45da48c84 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -98,7 +98,7 @@ $(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_D $(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) diff --git a/core/java.mk b/core/java.mk index 6d8f23709e..842fcbf3f4 100644 --- a/core/java.mk +++ b/core/java.mk @@ -296,7 +296,7 @@ $(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_D $(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)