commit 9ab835d4e53ee519bbffa7ff7bfeba2921cee702
author Tobias Thierer <tobiast@google.com> Fri Aug 11 13:22:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 13:22:51 2017 +0000
tree 1764e7f696f018dd4cb1d13ef62c5fd515ac3dd5
parent 877a64c813e04d0849a6e55d837966abfde5f8cb
parent ab333afe6861bdcd99e59b86ba62c38fb9f9271e

Merge "Omit module-info.class when unzipping jar files." am: 5ae6434575 am: 3e55981366 am: da8798f218
am: ab333afe68

Change-Id: I30700c24c900ef7cef3f24ab0eda911e7b86c91c

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a2261e0..bbcdea1 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2183,7 +2183,7 @@
       echo Missing file $$f; \
       exit 1; \
     fi; \
-    unzip -qo $$f -d $(2); \
+    unzip -qo $$f -d $(2) -x module-info.class; \
   done
   $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF)
 endef