From e67944ee126df1454ff9525927e3cc552c617ab3 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 22 Oct 2010 14:14:59 -0700 Subject: [PATCH] Switch Unbundled apps from generic.mk to full.mk. Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a --- target/product/AndroidProducts.mk | 5 +++-- target/product/full.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 89b37e075..32416c586 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 6f4aded8c..a39c13bb9 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) -- 2.11.0