tryserver.chromium.android: Add new trybots for architectures.

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x86_dbg_analyze.json

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x86_dbg_analyze.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_compile_dbg_analyze.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x86_dbg_analyze.json
similarity index 95%
copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_compile_dbg_analyze.json
copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x86_dbg_analyze.json
index bdc30672aaa4f6593d3c30bad2f1400888778aca..1e770aed6f7ab32cf95a9f8c06bf696cffc73398 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_compile_dbg_analyze.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x86_dbg_analyze.json
@@ -7,7 +7,7 @@
       "--master",
       "tryserver.chromium.android",
       "--builder",
-      "android_chromium_gn_compile_dbg",
+      "android_compile_x86_dbg",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -113,7 +113,7 @@
     "env": {
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
-      "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
+      "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=ia32 use_goma=1",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE[depot_tools]"
     },
     "name": "gclient runhooks (with patch)"
@@ -128,11 +128,10 @@
       "--",
       "--build-config-fs",
       "Debug",
-      "--use-src-side-runtest-py",
       "--paths",
       "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
       "--properties",
-      "{\"buildername\": \"android_chromium_gn_compile_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+      "{\"buildername\": \"android_compile_x86_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "get compile targets for scripts",
@@ -146,13 +145,13 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+      "[SLAVE_BUILD]/src/testing/buildbot/chromium.android.json",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "read test spec",
     "~followup_annotations": [
-      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
+      "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
@@ -208,7 +207,7 @@
       "-m",
       "tryserver.chromium.android",
       "-b",
-      "android_chromium_gn_compile_dbg",
+      "android_compile_x86_dbg",
       "-v",
       "//out/Debug",
       "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": []}",