summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorSteve Moyer <smoyer@google.com>2014-02-07 11:46:08 -0800
committerQiwen Zhao <zhao@google.com>2014-06-04 09:41:24 -0700
commit37773821f150778c48ef3519407d8ee71dd66a30 (patch)
tree82ef8bc9d7203c0fd20b28e26b39cc22e11837f2 /target
parent008dc16cb06976620c0fa1e51942f2d1c6af54f3 (diff)
downloadbuild-37773821f150778c48ef3519407d8ee71dd66a30.zip
build-37773821f150778c48ef3519407d8ee71dd66a30.tar.gz
build-37773821f150778c48ef3519407d8ee71dd66a30.tar.bz2
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests Conflicts: target/product/sdk.mk Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Diffstat (limited to 'target')
-rw-r--r--target/product/sdk.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 04157e8..2962fd2 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