From 5dd3e1d31293aaaae7c0c213743a7ca77d2dd688 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Wed, 14 Jan 2015 16:21:39 +0100 Subject: [PATCH] Don't exlude META-INF resources when building with Jack java-to-jack is not manipulating jar files, just zip files so there are no META-INF files generated by jar in them and no reason to filter them out. And mainly, there are valid META-INF resources in the tree we must keep. Bug: 8287658 Bug: 18901198 Change-Id: Ice0fafca686b8fa3bafd886076946fbb1f952fb6 --- core/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index 07b952a7e..1da1d9d59 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1783,7 +1783,7 @@ $(if $(PRIVATE_EXTRA_JAR_ARGS), $(hide) mkdir -p $@.res.tmp $(hide) $(call create-empty-package-at,$@.res.tmp.zip) $(hide) $(call add-java-resources-to,$@.res.tmp.zip) - $(hide) $(call unzip-jar-files,$@.res.tmp.zip,$@.res.tmp) + $(hide) unzip -qo $@.res.tmp.zip -d $@.res.tmp $(hide) rm $@.res.tmp.zip) $(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \