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

Commit f6dfd7b6 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code." 

* commit 'ddc5a8f7':
  Add back Java resources to apk without Java code.
parents 8853f518 ddc5a8f7

core/dpi_specific_apk.mk

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

core/package_internal.mk

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