Add AMP support to test runner.

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index 1e8769310e7d797dc0d872e01a1b0972d31e9551..cabab2e42e35758f695ed7d62b3ce3b1b8952b11 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -42,9 +42,12 @@ class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, options, isolate_delegate):
     super(GtestTestInstance, self).__init__()
+    #TODO(jbudorick): Support multiple test suites.

[jbudorick, 2014/12/05 01:01:46]

nit: space before TODO

[rnephew (Reviews Here), 2014/12/05 15:45:40]

Done.

+    if len(options.suite_name) > 1:
+      raise ValueError("Currently supports only 1 suite")

[jbudorick, 2014/12/05 01:01:46]

nit: clarify that gtest in platform mode only support a single suite

[rnephew (Reviews Here), 2014/12/05 15:45:40]

Done.

     self._apk_path = os.path.join(
-        constants.GetOutDirectory(), '%s_apk' % options.suite_name,
-        '%s-debug.apk' % options.suite_name)
+        constants.GetOutDirectory(), '%s_apk' % options.suite_name[0],
+        '%s-debug.apk' % options.suite_name[0])
     self._data_deps = []
     self._gtest_filter = options.test_filter
     if options.isolate_file_path: