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

Merge "Automatically add Java resources carried by static Java libraries."

This commit is contained in:
Ying Wang 2012-08-13 08:46:02 -07:00 committed by Android (Google) Code Review
parent 81a2f33a87 8548062922
commit 939c427de2
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/definitions.mk
View File

@ -1480,7 +1480,6 @@ endef
define transform-java-to-classes.jar define transform-java-to-classes.jar
@echo "target Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" @echo "target Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH)) $(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH))
$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
endef endef
# Override the above definitions if we want to do incremetal javac # Override the above definitions if we want to do incremetal javac
@ -1613,12 +1612,27 @@ cp $(PRIVATE_DEX_FILE) $$_adtp_classes_dex && \
$(AAPT) add -k $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex) $(AAPT) add -k $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex)
endef endef
# Add java resources added by the current module.
#
define add-java-resources-to-package define add-java-resources-to-package
$(call dump-words-to-file, $(PRIVATE_EXTRA_JAR_ARGS), $(dir $@)jar-arg-list) $(call dump-words-to-file, $(PRIVATE_EXTRA_JAR_ARGS), $(dir $@)jar-arg-list)
$(hide) jar uf $@ @$(dir $@)jar-arg-list $(hide) jar uf $@ @$(dir $@)jar-arg-list
@rm -f $(dir $@)jar-arg-list @rm -f $(dir $@)jar-arg-list
endef endef
# Add java resources carried by static Java libraries.
#
define add-carried-java-resources
$(hide) if [ -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) ] ; then \
java_res_jar_flags=$$(find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -type f -a -not -name "*.class" \
| sed -e "s?^$(PRIVATE_CLASS_INTERMEDIATES_DIR)/? -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) ?"); \
if [ -n "$$java_res_jar_flags" ] ; then \
echo $$java_res_jar_flags >$(dir $@)java_res_jar_flags; \
jar uf $@ $$java_res_jar_flags; \
fi; \
fi
endef
# Sign a package using the specified key/cert. # Sign a package using the specified key/cert.
# #
define sign-package define sign-package

1
core/host_java_library.mk
View File

@ -82,6 +82,7 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) | $(AAPT)
@echo "Host Jar: $(PRIVATE_MODULE) ($@)" @echo "Host Jar: $(PRIVATE_MODULE) ($@)"
$(create-empty-package) $(create-empty-package)
$(add-dex-to-package) $(add-dex-to-package)
$(add-carried-java-resources)
ifneq ($(extra_jar_args),) ifneq ($(extra_jar_args),)
$(add-java-resources-to-package) $(add-java-resources-to-package)
endif endif

1
core/java_library.mk
View File

@ -67,6 +67,7 @@ $(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(AAPT)
@echo "target Jar: $(PRIVATE_MODULE) ($@)" @echo "target Jar: $(PRIVATE_MODULE) ($@)"
$(create-empty-package) $(create-empty-package)
$(add-dex-to-package) $(add-dex-to-package)
$(add-carried-java-resources)
ifneq ($(extra_jar_args),) ifneq ($(extra_jar_args),)
$(add-java-resources-to-package) $(add-java-resources-to-package)
endif endif

1
core/package.mk
View File

@ -376,6 +376,7 @@ endif
ifneq ($(full_classes_jar),) ifneq ($(full_classes_jar),)
$(add-dex-to-package) $(add-dex-to-package)
endif endif
$(add-carried-java-resources)
ifneq ($(extra_jar_args),) ifneq ($(extra_jar_args),)
$(add-java-resources-to-package) $(add-java-resources-to-package)
endif endif