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

Commit 5dd3e1d3 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

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
parent 608b1812

core/definitions.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -1783,7 +1783,7 @@ $(if $(PRIVATE_EXTRA_JAR_ARGS), 
	$(hide) mkdir -p $@.res.tmp

	$(hide) mkdir -p $@.res.tmp

	$(hide) $(call create-empty-package-at,$@.res.tmp.zip)

	$(hide) $(call create-empty-package-at,$@.res.tmp.zip)

	$(hide) $(call add-java-resources-to,$@.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) rm $@.res.tmp.zip)

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \