Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b27d187 authored by Ying Wang's avatar Ying Wang
Browse files

Add back Java resources to apk without Java code. 

With commit 33360dd5 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.

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
parent 921a5f89

core/dpi_specific_apk.mk

+4 −1
Original line number Diff line number Diff line
@@ -58,7 +58,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)

ifdef LOCAL_JACK_ENABLED

	$(add-carried-jack-resources)

core/package_internal.mk

+4 −1
Original line number Diff line number Diff line
@@ -423,7 +423,10 @@ endif 
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

ifdef LOCAL_JACK_ENABLED