p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba am: e665010297 

am: 4a03375cc7

Change-Id: I70f7b31f7e4e017f1358528d13e5bfe5e2ff7242
This commit is contained in:
Nan Zhang 2017-09-02 05:23:24 +00:00 committed by android-build-merger
parent 5b0ebe7304 4a03375cc7
commit 8e1c7e1455
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/definitions.mk
View File

@ -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

4
core/java_library.mk
View File

@ -84,13 +84,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,$@)