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

testing/buildbot/chromium.perf.json

Index: testing/buildbot/chromium.perf.json
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
index 361a029525bcba4a46a34f744b5ca3d2b39c0cfa..bc70eae80aec296983e5f1a0142bae3323e1c7bd 100644
--- a/testing/buildbot/chromium.perf.json
+++ b/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"

[Dirk Pranke, 2016/10/26 18:45:18]

Can we add --adb-path automatically in gtest_perf_test.py, or do we only need
this for some steps and not others?

I think I don't really understand what the background for this change is ...

[jbudorick, 2016/10/27 00:19:21]

Ideally, we only need this for some bots and not others & this would be
transparently passed down from the recipe. That appeared to be a significantly
larger can of worms, though.
stip and I are in the middle of rolling to the N SDK (the linked bug). That
rolls a new version of adb into *most* uses of adb in chromium (including this
one if no alternative adb path is specified). Telemetry, however, uses a
different adb path. When an adb client invocation sees an adb server of a
different version, it kills it, often with catastrophic results. We need
everything in a given build to use the same adb path that telemetry uses to
prevent that from happening while I work on a longer term fix that allows
telemetry's adb path to be configured (
(https://github.com/catapult-project/catapult/issues/2901).

         ],
         "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"