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

Commit 27efd6e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix build error about jar manifest"

parents 2231df8a 7e00234b

core/host_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)