From 37773821f150778c48ef3519407d8ee71dd66a30 Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Fri, 7 Feb 2014 11:46:08 -0800 Subject: [PATCH] DO NOT MERGE: Combine emulator test projects into a single apk SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests Conflicts: target/product/sdk.mk Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871 --- target/product/sdk.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 04157e84e..2962fd23b 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -65,6 +65,7 @@ PRODUCT_PACKAGES := \ 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