tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build error about jar manifest

Browse source 
It still depended on old intermediate files (out/host/common/obj/JAVA_LIBRARIES/<modulename>_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
This commit is contained in:
Jeongik Cha 2023-05-23 13:56:35 +09:00
parent 54403316c0
commit 7e00234b84
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/host_java_library.mk
View file

@ -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) \ $(full_classes_combined_jar): $(full_classes_compiled_jar) \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(full_static_java_libs) | $(MERGE_ZIPS) $(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 $<) \ $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \
$@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES) $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)

2
core/java.mk
View file

@ -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) \ $(full_classes_combined_jar): $(full_classes_compiled_jar) \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(full_static_java_libs) | $(MERGE_ZIPS) $(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 $<) \ $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \
$@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES) $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)