diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-01-15 17:56:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 17:56:23 +0000 |
| commit | b515f27d6bbe7a976bd0920f031812f62bb135f7 (patch) | |
| tree | 9aed156440fde29ed5d0eed4ee271da9599e0e8a /core/definitions.mk | |
| parent | 2826cb961ba5d788c8e8e84e7882d359875453cf (diff) | |
| parent | 5dd3e1d31293aaaae7c0c213743a7ca77d2dd688 (diff) | |
| download | build-b515f27d6bbe7a976bd0920f031812f62bb135f7.zip build-b515f27d6bbe7a976bd0920f031812f62bb135f7.tar.gz build-b515f27d6bbe7a976bd0920f031812f62bb135f7.tar.bz2 | |
Merge "Don't exlude META-INF resources when building with Jack"
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 6ee1500..e38e36d 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1805,7 +1805,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"; \ |