summaryrefslogtreecommitdiffstats
path: root/core/package.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-05-26 13:13:56 -0700
committerYing Wang <wangying@google.com>2010-05-26 13:39:31 -0700
commit529113098350c026ec521258d4c6fba51f285a48 (patch)
treebec1876c0af8a3500c0843aae7cf6dd8245be4da /core/package.mk
parent8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7 (diff)
downloadbuild-529113098350c026ec521258d4c6fba51f285a48.zip
build-529113098350c026ec521258d4c6fba51f285a48.tar.gz
build-529113098350c026ec521258d4c6fba51f285a48.tar.bz2
Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
Diffstat (limited to 'core/package.mk')
-rw-r--r--core/package.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/package.mk b/core/package.mk
index 24807f9..d5de77b 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -304,6 +304,10 @@ PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)
# Define the rule to build the actual package.
$(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN)
$(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries)
+ifeq ($(strip $(is_unbundled_app_build)),true)
+ # Include all resources for unbundled apps.
+ $(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG :=
+endif
$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)
@echo "target Package: $(PRIVATE_MODULE) ($@)"
$(create-empty-package)