summaryrefslogtreecommitdiffstats
path: root/target
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 /target
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 'target')
-rw-r--r--target/product/AndroidProducts.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 2774968..798c35c 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -25,9 +25,16 @@
# it includes.
#
+ifeq ($(strip $(is_unbundled_app_build)),true)
+# An unbundled app build needs only generic.mk.
+PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/core.mk \
+ $(LOCAL_DIR)/generic.mk
+else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
$(LOCAL_DIR)/generic.mk \
$(LOCAL_DIR)/full.mk \
$(LOCAL_DIR)/sdk.mk \
$(LOCAL_DIR)/sim.mk
+endif