commit f6dfd7b608f4e53b83dcb0713447f3040a0790f2
author Ying Wang <wangying@google.com> Fri Mar 27 21:09:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 27 21:09:39 2015 +0000
tree 1bb4df5c8b998121784951c092019c0fc455b1da
parent 8853f5181b1ae1682d9433c28e120f25f63a4721
parent ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9

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

* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
  Add back Java resources to apk without Java code.

core/dpi_specific_apk.mk

diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk
index 0e8cbdf..06e498d 100644
--- a/core/dpi_specific_apk.mk
+++ b/core/dpi_specific_apk.mk
@@ -47,7 +47,10 @@
 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

diff --git a/core/package_internal.mk b/core/package_internal.mk
index e389b04..5dac455 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -396,7 +396,10 @@
 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)