From 6bbb6a1fe323aef213a486ac2ec8dcaff424158b Mon Sep 17 00:00:00 2001
From: Steve Moyer <smoyer@google.com>
Date: Tue, 18 Feb 2014 17:46:19 -0800
Subject: [PATCH] Combine emulator test projects into a single apk

SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
---
 target/product/sdk.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 9eafa8cc5..15fa1f739 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -18,16 +18,15 @@ PRODUCT_PROPERTY_OVERRIDES :=
 
 PRODUCT_PACKAGES := \
 	ApiDemos \
-	ConnectivityTest \
 	CubeLiveWallpapers \
 	CustomLocale \
 	Development \
 	DevelopmentSettings \
 	Dialer \
+	EmulatorSmokeTests \
 	Fallback \
 	Gallery \
 	GestureBuilder \
-	GpsLocationTest \
 	LegacyCamera \
 	librs_jni \
 	libwnndict \
@@ -43,7 +42,6 @@ PRODUCT_PACKAGES := \
 	SdkSetup \
 	SmokeTest \
 	SmokeTestApp \
-	SmsTest \
 	SoftKeyboard \
 	sqlite3 \
 	SystemUI \
-- 
2.11.0