diff options
| author | Steve Moyer <smoyer@google.com> | 2014-02-07 11:46:08 -0800 |
|---|---|---|
| committer | Steve Moyer <smoyer@google.com> | 2014-04-03 16:01:06 -0700 |
| commit | 0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00 (patch) | |
| tree | 8d14a9130b7894f746baa61a05563822473a2613 | |
| parent | 8c60a1df4379bcc2fef020878aef8d78233f906d (diff) | |
| download | build-0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00.tar.gz | |
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
| -rw-r--r-- | target/product/sdk.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 79ea492fd8..0c7d174b81 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -55,15 +55,15 @@ PRODUCT_PACKAGES := \ QuickSearchBox \ WidgetPreview \ librs_jni \ - ConnectivityTest \ - GpsLocationTest \ CalendarProvider \ Calendar \ SmokeTest \ SmokeTestApp \ + EmulatorSmokeTests \ rild \ LegacyCamera + # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk -include development/build/product_sdk.mk |