diff options
| author | Wink Saville <wink@google.com> | 2012-05-31 13:25:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-31 13:25:41 -0700 |
| commit | 84690f969e993ca712d028b9acfb0a7c17c08c44 (patch) | |
| tree | 0ed3cd29cb5d9ab8c598e59de3517fe336d3fdb8 | |
| parent | 53ba6b22f94c1192541b11ada001b68823b97efa (diff) | |
| parent | f97105ea898fd4ad83ca55e391c0d512e3497b9b (diff) | |
| download | build-84690f969e993ca712d028b9acfb0a7c17c08c44.zip build-84690f969e993ca712d028b9acfb0a7c17c08c44.tar.gz build-84690f969e993ca712d028b9acfb0a7c17c08c44.tar.bz2 | |
am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
| -rw-r--r-- | core/user_tags.mk | 1 | ||||
| -rw-r--r-- | target/product/sdk.mk | 3 | ||||
| -rw-r--r-- | 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 325c600..ca2594b 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 9486dd4..fceb2e5 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 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 := \ |