DO NOT MERGE: Combine emulator test projects into a single apk

SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 5926f19..04157e8 100644 (file)
--- 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