openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Add back Java resources to apk without Java code. 

With commit 33360dd569 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 8b27d1879c)

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
This commit is contained in:
Ying Wang 2015-03-27 11:07:17 -07:00
parent 1b23b33d92
commit 454bcff255
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/dpi_specific_apk.mk
View File

@ -47,7 +47,10 @@ $(built_dpi_apk) : $(all_res_assets) $(jni_shared_libraries) $(full_android_mani
ifneq ($(jni_shared_libraries),) ifneq ($(jni_shared_libraries),)
$(add-jni-shared-libs-to-package) $(add-jni-shared-libs-to-package)
endif 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) $(add-dex-to-package)
endif endif
$(add-carried-java-resources) $(add-carried-java-resources)

5
core/package_internal.mk
View File

@ -396,7 +396,10 @@ $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_
ifneq ($(jni_shared_libraries),) ifneq ($(jni_shared_libraries),)
$(add-jni-shared-libs-to-package) $(add-jni-shared-libs-to-package)
endif 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) $(add-dex-to-package)
endif endif
$(sign-package) $(sign-package)