Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 99e44773ba
am: e665010297
Change-Id: I2e1d3109dae69068a9b9b14751a42065e8d17902
diff --git a/core/definitions.mk b/core/definitions.mk
index 15752f9..ffeb663 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2656,12 +2656,17 @@
# 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
diff --git a/core/java_library.mk b/core/java_library.mk
index ea9874b..dace974 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -83,13 +83,13 @@
$(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,$@)