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

Commit 341ccb61 authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Fix log spam in unzip-jar-files 

Commit 2bdbb6e9 added
command line flags to the unzip command in unzip-jar-files
to skip the path 'module-info.class', if present.

This has led to log spam because unzip warns when an
excluded file is not present in the zip/jar file, and
that warning cannot be suppressed via command line flags.
Therefore, this CL modifies the unzip-jar-files macro
to rm -f the module-info.class file after the fact, if
it was created, which does not lead to log spam.

Note that module-info.class will be filtered out of
.jar dependencies (such as ASM 6.0) regardless of
whether one is building with an OpenJDK 9+ toolchain.

Test: Treehugger.
Bug: 64719206
Change-Id: Ic6be806a50557b4ba13fc18da91a8af12d14586c
parent 5ae64345

core/definitions.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -2175,7 +2175,8 @@ define unzip-jar-files 
      echo Missing file $$f; \

      echo Missing file $$f; \

      exit 1; \

      exit 1; \

    fi; \

    fi; \

    unzip -qo $$f -d $(2) -x module-info.class; \

    unzip -qo $$f -d $(2); \

    rm -f $(2)/module-info.class; \

  done

  done

  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF)

  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF)

endef

endef