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

This commit is contained in:
Steve Moyer
2014-04-04 16:32:06 +00:00
committed by Gerrit Code Review

View File

@@ -55,15 +55,15 @@ 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
# 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