Merge "Fix rild running in Nakasi." into jb-dev
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 325c600..ca2594b 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -443,7 +443,6 @@
resize2fs \
resize2fs_host \
rgb2565 \
- rild \
rsg-generator \
run-as \
runtime \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 8a7e36e..a5890a9 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -62,7 +62,8 @@
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 a0220de..89ed20a 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 := \