Update config entry of 'Android Compile Perf' and 'Android arm64 Compile Perf' to the LUCI version

Bug: 828469, 828465
Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: I0d5fd3cdb0a701c56c2ac717d1e7b15d6a84380d
Reviewed-on: https://chromium-review.googlesource.com/1238482Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#593820}

infra/config/global/luci-milo.cfg

@@ -1227,8 +1227,7 @@ consoles {
     short_name: "a64"
   }
   builders {
-    name: "buildbot/chromium.perf/Android Compile Perf"
-    name: "buildbucket/luci.chrome.ci/Android Compile Perf"
+    name: "buildbucket/luci.chrome.ci/android-builder-perf"
     category: "builder|android|compile"
     short_name: "arm"
   }

testing/buildbot/chromium.perf.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See //tools/perf/generate_perf_data to make changes": {},
-  "Android Compile Perf": {
-    "additional_compile_targets": [
-      "microdump_stackwalk",
-      "angle_perftests"
-    ]
-  },
   "Android Nexus5 Perf": {
     "isolated_scripts": [
       {
@@ -341,12 +335,6 @@
       }
     ]
   },
-  "Android arm64 Compile Perf": {
-    "additional_compile_targets": [
-      "microdump_stackwalk",
-      "angle_perftests"
-    ]
-  },
   "Linux Builder Perf": {
     "additional_compile_targets": [
       "chromedriver"
@@ -812,6 +800,12 @@
       "chromedriver"
     ]
   },
+  "android-builder-perf": {
+    "additional_compile_targets": [
+      "microdump_stackwalk",
+      "angle_perftests"
+    ]
+  },
   "android-go-perf": {
     "isolated_scripts": [
       {
@@ -1139,6 +1133,12 @@
       }
     ]
   },
+  "android_arm64-builder-perf": {
+    "additional_compile_targets": [
+      "microdump_stackwalk",
+      "angle_perftests"
+    ]
+  },
   "linux-perf": {
     "isolated_scripts": [
       {

tools/mb/mb_config.pyl

@@ -377,11 +377,8 @@
 
     'chromium.perf': {
       'Android Builder Perf': 'official_goma_minimal_symbols_android',
-      # TODO(crbug.com/828465): Remove 'Android arm64 Builder Perf'
       'Android arm64 Builder Perf': 'official_goma_minimal_symbols_android_arm64',
       'android_arm64-builder-perf': 'official_goma_minimal_symbols_android_arm64',
-      'Android Compile Perf': 'official_goma_minimal_symbols_android',
-      'Android arm64 Compile Perf': 'official_goma_minimal_symbols_android_arm64',
       'android-builder-perf': 'official_goma_minimal_symbols_android',
       'linux-builder-perf': 'official_goma_perf',
       # TODO(crbug.com/828468): Remove 'Mac Builder Perf'

tools/perf/core/perf_data_generator.py

@@ -42,8 +42,8 @@ from py_utils import discover
 # bisecting Chrome builds with their web tests. For questions or to report
 # issues, please contact johnchen@chromium.org.
 BUILDER_ADDITIONAL_COMPILE_TARGETS = {
-    'Android Compile Perf': ['microdump_stackwalk', 'angle_perftests'],
-    'Android arm64 Compile Perf': ['microdump_stackwalk', 'angle_perftests'],
+    'android-builder-perf': ['microdump_stackwalk', 'angle_perftests'],
+    'android_arm64-builder-perf': ['microdump_stackwalk', 'angle_perftests'],
     'Linux Builder Perf': ['chromedriver'],
     'Mac Builder Perf': ['chromedriver'],
     'Win Builder Perf': ['chromedriver'],