Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master

This commit is contained in:
Steve Moyer
2014-06-17 17:34:43 +00:00
committed by Android (Google) Code Review

View File

@@ -55,16 +55,16 @@ PRODUCT_PACKAGES := \
QuickSearchBox \ QuickSearchBox \
WidgetPreview \ WidgetPreview \
librs_jni \ librs_jni \
ConnectivityTest \
GpsLocationTest \
CalendarProvider \ CalendarProvider \
Calendar \ Calendar \
SmokeTest \ SmokeTest \
SmokeTestApp \ SmokeTestApp \
EmulatorSmokeTests \
rild \ rild \
LegacyCamera \ LegacyCamera \
Dialer Dialer
# Define the host tools and libs that are parts of the SDK. # Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk -include sdk/build/product_sdk.mk
-include development/build/product_sdk.mk -include development/build/product_sdk.mk