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

Commit e01d2ab9 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Add back Java resources to apk without Java code."

parents 97380849 8b27d187

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