commit f1617415439c14bfc33a5fd8989e62c8f9e4dd1e
author Tobias Thierer <tobiast@google.com> Wed Aug 16 10:04:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 16 10:04:15 2017 +0000
tree 58f74b717ed26384183fc95da5ea0acb6c95fffb
parent 3faefab6d92d446e13941378c9eddd39128bc586
parent 17f23f3837eb0e87359cb98ebc9c41ac272a5a93

Merge "Fix log spam in unzip-jar-files" am: 05ecd66557
am: 17f23f3837

Change-Id: Id49b99ce742c23fb49db0231b3212a7a50c69756

core/definitions.mk

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