commit 8ffec13d9b3ea46a5aea1837c1184e67a908f1ef
author Ying Wang <wangying@google.com> Fri Mar 27 18:32:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 27 18:32:00 2015 +0000
tree 926d8969cfb297314584d7fa1d6655a8731a634f
parent 1b23b33d92f32626584153739308e9147d1541bd
parent 454bcff25557ca29866081d9a9037673096e463b

Merge "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)