From 689f117b6325cfb58cbb07560f503b7f7c688707 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Thu, 31 May 2012 10:35:52 -0700 Subject: [PATCH] Fix rild running in Nakasi. The module rild is telephony specific, since Nakasi has no radio it shouldn't run rild. Changing the build system so rild is optional for products that don't have telephony support. Since rild is now optional, it is necessary to add it explicitly to the sdk build as the sdk build is special. Bug: 6463864 Change-Id: If944e051023b567807585fb91163a1e3f79c1024 --- core/user_tags.mk | 1 - target/product/sdk.mk | 3 ++- target/product/telephony.mk | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/user_tags.mk b/core/user_tags.mk index 325c6006f4..ca2594bf67 100644 --- a/core/user_tags.mk +++ b/core/user_tags.mk @@ -443,7 +443,6 @@ GRANDFATHERED_USER_MODULES += \ resize2fs \ resize2fs_host \ rgb2565 \ - rild \ rsg-generator \ run-as \ runtime \ diff --git a/target/product/sdk.mk b/target/product/sdk.mk index a5d941eab3..c893860418 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -62,7 +62,8 @@ PRODUCT_PACKAGES := \ CalendarProvider \ Calendar \ SmokeTest \ - SmokeTestApp + SmokeTestApp \ + rild # Define the host tools and libs that are parts of the SDK. diff --git a/target/product/telephony.mk b/target/product/telephony.mk index a0220de74f..89ed20ab00 100644 --- a/target/product/telephony.mk +++ b/target/product/telephony.mk @@ -18,6 +18,7 @@ # to products that have telephony hardware. PRODUCT_PACKAGES := \ - Mms + Mms \ + rild PRODUCT_COPY_FILES := \