diff options
| author | Ying Wang <wangying@google.com> | 2012-07-31 09:40:00 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-07-31 09:40:00 -0700 |
| commit | 721449ea04b4f08dbea0bcfad4362dbc8f5bea6a (patch) | |
| tree | bb75d39ae1cc722f28859a62b9e542e3fc6878c1 /core/package.mk | |
| parent | 855a7b57b78f906df69c7070ff2f7018eb9fb849 (diff) | |
| download | build-721449ea04b4f08dbea0bcfad4362dbc8f5bea6a.zip build-721449ea04b4f08dbea0bcfad4362dbc8f5bea6a.tar.gz build-721449ea04b4f08dbea0bcfad4362dbc8f5bea6a.tar.bz2 | |
Allow Java resource in apk.
Bug: 6892294
Change-Id: I093bddf7326d600689ff2ec3318741a5270751cc
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 11 |
1 files changed, 3 insertions, 8 deletions
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 @@ $(error $(LOCAL_PATH): Package modules may not define LOCAL_MODULE) 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 @@ endif 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) |