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

SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
This commit is contained in:
Steve Moyer 2014-02-07 11:46:08 -08:00
parent 8c60a1df43
commit 0ced06ea0f

View file

@ -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