[Android] Pass devil adb path to the gtest perf tests.

BUG=623989
TBR=dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2437383002
Cr-Commit-Position: refs/heads/master@{#427218}

testing/buildbot/chromium.perf.fyi.json

@@ -5,14 +5,18 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
       },
       {
         "args": [
-          "gpu_perftests"
+          "gpu_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "gpu_perftests",
         "script": "gtest_perf_test.py"

testing/buildbot/chromium.perf.json

@@ -5,14 +5,18 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
       },
       {
         "args": [
-          "gpu_perftests"
+          "gpu_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "gpu_perftests",
         "script": "gtest_perf_test.py"
@@ -23,14 +27,18 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
       },
       {
         "args": [
-          "gpu_perftests"
+          "gpu_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "gpu_perftests",
         "script": "gtest_perf_test.py"
@@ -41,7 +49,9 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
@@ -52,14 +62,18 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
       },
       {
         "args": [
-          "gpu_perftests"
+          "gpu_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "gpu_perftests",
         "script": "gtest_perf_test.py"
@@ -70,14 +84,18 @@
     "scripts": [
       {
         "args": [
-          "cc_perftests"
+          "cc_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "cc_perftests",
         "script": "gtest_perf_test.py"
       },
       {
         "args": [
-          "gpu_perftests"
+          "gpu_perftests",
+          "--adb-path",
+          "src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
         ],
         "name": "gpu_perftests",
         "script": "gtest_perf_test.py"

testing/scripts/gtest_perf_test.py

@@ -48,6 +48,7 @@ def main_run(args):
               'run_%s' % test_suite),
           '--verbose',
       ])
+      gtest_args.extend(script_args[1:])
     else:
       gtest_args.extend(['--xvfb'])
       gtest_args.extend(script_args)

tools/perf/generate_perf_json.py

@@ -23,7 +23,9 @@ from telemetry.util import bot_utils
 SCRIPT_TESTS = [
   {
     'args': [
-      'gpu_perftests'
+      'gpu_perftests',
+      '--adb-path',
+      'src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb',
     ],
     'name': 'gpu_perftests',
     'script': 'gtest_perf_test.py',
@@ -56,7 +58,9 @@ SCRIPT_TESTS = [
   },
   {
     'args': [
-      'cc_perftests'
+      'cc_perftests',
+      '--adb-path',
+      'src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb',
     ],
     'name': 'cc_perftests',
     'script': 'gtest_perf_test.py',