Allow Java resource in apk.
Bug: 6892294
Change-Id: I093bddf7326d600689ff2ec3318741a5270751cc
diff --git a/core/package.mk b/core/package.mk
index 3f911fb..e1b7da3 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -53,14 +53,6 @@
endif
LOCAL_MODULE := $(LOCAL_PACKAGE_NAME)
-# Android packages should use Android resources or assets.
-ifneq (,$(LOCAL_JAVA_RESOURCE_DIRS))
-$(error $(LOCAL_PATH): Package modules may not set LOCAL_JAVA_RESOURCE_DIRS)
-endif
-ifneq (,$(LOCAL_JAVA_RESOURCE_FILES))
-$(error $(LOCAL_PATH): Package modules may not set LOCAL_JAVA_RESOURCE_FILES)
-endif
-
ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)
LOCAL_MANIFEST_FILE := AndroidManifest.xml
endif
@@ -384,6 +376,9 @@
ifneq ($(full_classes_jar),)
$(add-dex-to-package)
endif
+ifneq ($(extra_jar_args),)
+ $(add-java-resources-to-package)
+endif
$(sign-package)
@# Alignment must happen after all other zip operations.
$(align-package)