diff options
| author | Steve Moyer <smoyer@google.com> | 2014-02-07 11:46:08 -0800 |
|---|---|---|
| committer | Qiwen Zhao <zhao@google.com> | 2014-06-04 09:38:32 -0700 |
| commit | 008dc16cb06976620c0fa1e51942f2d1c6af54f3 (patch) | |
| tree | c8bc2207eb7b4f0efa02f3380bc2f36c176f3276 | |
| parent | 1d6506ca4bb62a8f66cf5f0a72bde096115e757a (diff) | |
| download | build-008dc16cb06976620c0fa1e51942f2d1c6af54f3.zip build-008dc16cb06976620c0fa1e51942f2d1c6af54f3.tar.gz build-008dc16cb06976620c0fa1e51942f2d1c6af54f3.tar.bz2 | |
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 5926f19..04157e8 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -55,16 +55,16 @@ PRODUCT_PACKAGES := \ QuickSearchBox \ WidgetPreview \ librs_jni \ - ConnectivityTest \ - GpsLocationTest \ CalendarProvider \ Calendar \ SmokeTest \ SmokeTestApp \ + EmulatorSmokeTests \ rild \ LegacyCamera \ Dialer + # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk -include development/build/product_sdk.mk |