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

Commit b06b09a0 authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am: 81bbac6a 

am: fdfd0b0d

* commit 'fdfd0b0d':
  Don't delete META-INF in jack-java-to-dex when packing resources.
parents 3862fa12 fdfd0b0d

core/definitions.mk

+6 −5
Original line number Original line Diff line number Diff line
@@ -1760,7 +1760,8 @@ define dump-words-to-file 
endef

endef





# For a list of jar files, unzip them to a specified directory,

# For a list of jar files, unzip them to a specified directory,

# but make sure that no META-INF files come along for the ride.

# but make sure that no META-INF files come along for the ride,

# unless PRIVATE_DONT_DELETE_JAR_META_INF is set.

#

#

# $(1): files to unzip

# $(1): files to unzip

# $(2): destination directory

# $(2): destination directory
@@ -1772,8 +1773,8 @@ define unzip-jar-files 
      exit 1; \

      exit 1; \

    fi; \

    fi; \

    unzip -qo $$f -d $(2); \

    unzip -qo $$f -d $(2); \

  done \

  done

  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,;rm -rf $(2)/META-INF)

  $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF)

endef

endef





# Call jack

# Call jack
@@ -1875,7 +1876,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"; \
@@ -1915,7 +1916,7 @@ define transform-jar-to-jack 
	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<

	$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<

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

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

	$(hide) $(call unzip-jar-files,$<,$@.tmpjill.res)

	$(hide) unzip -qo $< -d @.tmpjill.res

	$(hide) find $@.tmpjill.res -iname "*.class" -delete

	$(hide) find $@.tmpjill.res -iname "*.class" -delete

	$(hide) $(call call-jack) \

	$(hide) $(call call-jack) \

        -D jack.import.resource.policy=keep-first \

        -D jack.import.resource.policy=keep-first \