am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev

* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b': Fix rild running in Nakasi.
2012-05-31 13:25:41 -07:00
parent 53ba6b22f9 f97105ea89
commit 84690f969e
3 changed files with 4 additions and 3 deletions
--- 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 \
--- 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.
--- 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 := \