summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-10-22 14:14:59 -0700
committerYing Wang <wangying@google.com>2010-10-22 14:14:59 -0700
commite67944ee126df1454ff9525927e3cc552c617ab3 (patch)
tree678d87ea0389b70c3b100cdadf7ecf8c5e9b96aa /target
parent040e8cf01b2078432ec5e52b01d238de39245833 (diff)
downloadbuild-e67944ee126df1454ff9525927e3cc552c617ab3.zip
build-e67944ee126df1454ff9525927e3cc552c617ab3.tar.gz
build-e67944ee126df1454ff9525927e3cc552c617ab3.tar.bz2
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
Diffstat (limited to 'target')
-rw-r--r--target/product/AndroidProducts.mk5
-rw-r--r--target/product/full.mk2
2 files changed, 4 insertions, 3 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 89b37e0..32416c5 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -25,11 +25,12 @@
# it includes.
#
-# An unbundled app build needs only generic.mk.
+# Unbundled apps will be built with the default product config.
ifneq ($(TARGET_BUILD_APPS),)
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
- $(LOCAL_DIR)/generic.mk
+ $(LOCAL_DIR)/generic.mk \
+ $(LOCAL_DIR)/full.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
diff --git a/target/product/full.mk b/target/product/full.mk
index 6f4aded..a39c13b 100644
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -44,7 +44,7 @@ PRODUCT_LOCALES := en_US
# Pick up some sounds - stick with the short list to save space
# on smaller devices.
-$(call inherit-product, frameworks/base/data/sounds/OriginalAudio.mk)
+$(call inherit-product-if-exists, frameworks/base/data/sounds/OriginalAudio.mk)
# Get the TTS language packs
$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)