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

Commit 99e44773 authored by Nan Zhang's avatar Nan Zhang Committed by Gerrit Code Review
Browse files

Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"

parents 27bfc86d d05e19df

core/definitions.mk

+8 −3
Original line number Diff line number Diff line
@@ -2656,12 +2656,17 @@ endef 
# Add resources carried by static Jack libraries.

#

define add-carried-jack-resources

$(call add-carried-jack-resources-to,$@)

endef



# $(1) the target jar.

define add-carried-jack-resources-to

 $(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \

    find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f | sort \

        | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C \"$(PRIVATE_JACK_INTERMEDIATES_DIR)\" \"?" -e "s/$$/\"/" \

        > $(dir $@)jack_res_jar_flags; \

    if [ -s $(dir $@)jack_res_jar_flags ] ; then \

        $(JAR) uf $@ @$(dir $@)jack_res_jar_flags; \

        > $(dir $(1))jack_res_jar_flags; \

    if [ -s $(dir $(1))jack_res_jar_flags ] ; then \

        $(JAR) uf $(1) @$(dir $(1))jack_res_jar_flags; \

    fi; \

fi

endef

core/java_library.mk

+2 −2
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ $(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_D 
$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME)

	@echo "target Jar: $(PRIVATE_MODULE) ($@)"

ifdef LOCAL_JACK_ENABLED

	$(create-empty-package)

	$(create-empty-package-at,$@.tmp)

else

	$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)

endif

	$(call add-dex-to-package-arg,$@.tmp)

ifdef LOCAL_JACK_ENABLED

	$(add-carried-jack-resources)

	$(add-carried-jack-resources-to,$@.tmp)

endif

	$(hide) $(ZIPTIME) $@.tmp

	$(call commit-change-for-toc,$@)