commit 6f4de4bd13f0acaaa8b7c59e141c28d64aba48f4
author Ying Wang <wangying@google.com> Tue Jul 31 09:40:00 2012 -0700
committer Ying Wang <wangying@google.com> Tue Aug 28 12:37:27 2012 -0700
tree 0dd9efd428aef9a2d7367b879fd29ad875012209
parent 07791f870e8af381cef7ba7048bf5b1cf7b7ca9c

Allow Java resource in apk.

Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd

core/package.mk

diff --git a/core/package.mk b/core/package.mk
index 145c0b2..358caee 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