From 454bcff25557ca29866081d9a9037673096e463b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 27 Mar 2015 11:07:17 -0700 Subject: [PATCH] Add back Java resources to apk without Java code. With commit 33360dd56925276e4526f5f52c26423e2bb1a670 we moved Java resource packaging forward to creation of the jar file. But the Java resource packaging will be skipped if a module has no Java code at all. (The build system does support building an apk without Java code.) In this change we add back the Java resources directly to the built apk when the apk has no Java code. (cherry-picked from commit 8b27d1879c5692ebe6c5ac85383981fd96dfe2e1) Bug: 19947218 Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9 --- core/dpi_specific_apk.mk | 5 ++++- core/package_internal.mk | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk index 0e8cbdf91..06e498d8a 100644 --- a/core/dpi_specific_apk.mk +++ b/core/dpi_specific_apk.mk @@ -47,7 +47,10 @@ $(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_mani ifneq ($(jni_shared_libraries),) $(add-jni-shared-libs-to-package) endif -ifneq ($(full_classes_jar),) +ifeq ($(full_classes_jar),) +# We don't build jar, need to add the Java resources here. + $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) +else $(add-dex-to-package) endif $(add-carried-java-resources) diff --git a/core/package_internal.mk b/core/package_internal.mk index e389b0419..5dac455e6 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -396,7 +396,10 @@ $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_ ifneq ($(jni_shared_libraries),) $(add-jni-shared-libs-to-package) endif -ifneq ($(full_classes_jar),) +ifeq ($(full_classes_jar),) +# We don't build jar, need to add the Java resources here. + $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) +else $(add-dex-to-package) endif $(sign-package)