From 3f514202d5d36cb48d6e2cde8a9855a65b74ff0f Mon Sep 17 00:00:00 2001
From: Christopher Wiley <wiley@google.com>
Date: Wed, 18 May 2016 12:26:02 -0700
Subject: [PATCH] Allow using runtest with frameworks-services tests

( cherry-pick of 00d6fa79f7e384d3dde90118e08fcf7f7d5dc606 )

Specifying a runner allows developers to run commands like:

`runtest frameworks-services`

without getting a message like:

"Could not find instrumentation
com.android.frameworks.servicestests/android.test.InstrumentationTestRunner
on device."

Bug: 28833951
Change-Id: I76fb58a8fa16db503c8e98eb5a09c481d41e0a76
Test: Described above
---
 testrunner/test_defs.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 46ed2ab29..d475889f1 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -64,6 +64,7 @@ See test_defs.xsd for more information.
 <test name="frameworks-services"
     build_path="frameworks/base/services/tests/servicestests"
     package="com.android.frameworks.servicestests"
+    runner="android.support.test.runner.AndroidJUnitRunner"
     coverage_target="framework"
     continuous="true" />