1 files changed, 148 insertions, 2 deletions

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 17687e0a5c..f174b06420 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -11,6 +11,14 @@ builder_mixins {
 }
 
 builder_mixins {
+  name: "android"
+  mixins: "linux"
+  recipe {
+    properties: "target_os:android"
+  }
+}
+
+builder_mixins {
   name: "win"
   dimensions: "os:Windows-10"
 }
@@ -21,6 +29,82 @@ builder_mixins {
   dimensions: "cores:"  # Macs can be 4 or 8 cores.
 }
 
+builder_mixins {
+  name: "skia"
+  recipe {
+    properties: "skia:true"
+  }
+}
+
+builder_mixins {
+  name: "xfa"
+  recipe {
+    properties: "xfa:true"
+  }
+}
+
+builder_mixins {
+  name: "asan"
+  recipe {
+    properties: "memory_tool:asan"
+  }
+}
+
+builder_mixins {
+  name: "msan"
+  recipe {
+    properties: "memory_tool:msan"
+  }
+}
+
+builder_mixins {
+  name: "no_v8"
+  recipe {
+    properties: "v8:false"
+  }
+}
+
+builder_mixins {
+  name: "x86"
+  recipe {
+    properties: "target_cpu:x86"
+  }
+}
+
+builder_mixins {
+  name: "clang"
+  recipe {
+    properties: "clang:true"
+  }
+}
+
+builder_mixins {
+  name: "msvc"
+  recipe {
+    properties: "msvc:true"
+  }
+}
+
+builder_mixins {
+  name: "rel"
+  recipe {
+    properties: "rel:true"
+  }
+}
+
+builder_mixins {
+  name: "jumbo"
+  recipe {
+    properties: "jumbo:true"
+  }
+}
+
+builder_mixins {
+  name: "skip_test"
+  recipe {
+    properties: "skip_test:true"
+  }
+}
 
 acl_sets {
   name: "ci"
@@ -83,7 +167,7 @@ buckets {
 
     builders {
       name: "android"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "linux"
@@ -92,30 +176,40 @@ buckets {
     builders {
       name: "linux_asan_lsan"
       mixins: "linux"
+      mixins: "asan"
     }
     builders {
       name: "linux_msan"
       mixins: "linux"
+      mixins: "msan"
     }
     builders {
       name: "linux_no_v8"
       mixins: "linux"
+      mixins: "no_v8"
     }
     builders {
       name: "linux_xfa"
       mixins: "linux"
+      mixins: "xfa"
     }
     builders {
       name: "linux_xfa_asan_lsan"
       mixins: "linux"
+      mixins: "xfa"
+      mixins: "asan"
     }
     builders {
       name: "linux_xfa_msan"
       mixins: "linux"
+      mixins: "xfa"
+      mixins: "msan"
     }
     builders {
       name: "linux_xfa_rel"
       mixins: "linux"
+      mixins: "xfa"
+      mixins: "rel"
     }
     builders {
       name: "mac"
@@ -124,18 +218,24 @@ buckets {
     builders {
       name: "mac_no_v8"
       mixins: "mac"
+      mixins: "no_v8"
     }
     builders {
       name: "mac_xfa"
       mixins: "mac"
+      mixins: "xfa"
     }
     builders {
       name: "mac_xfa_rel"
       mixins: "mac"
+      mixins: "xfa"
+      mixins: "rel"
     }
     builders {
       name: "win_xfa_asan"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "asan"
     }
     builders {
       name: "windows"
@@ -144,30 +244,41 @@ buckets {
     builders {
       name: "windows_asan"
       mixins: "win"
+      mixins: "asan"
     }
     builders {
       name: "windows_no_v8"
       mixins: "win"
+      mixins: "no_v8"
     }
     builders {
       name: "windows_xfa"
       mixins: "win"
+      mixins: "xfa"
     }
     builders {
       name: "windows_xfa_32"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "x86"
     }
     builders {
       name: "windows_xfa_msvc"
       mixins: "win"
+      mixins: "msvc"
     }
     builders {
       name: "windows_xfa_msvc_32"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "msvc"
+      mixins: "x86"
     }
     builders {
       name: "windows_xfa_rel"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "rel"
     }
   }
 }
@@ -196,7 +307,7 @@ buckets {
 
     builders {
       name: "android"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "linux"
@@ -205,38 +316,49 @@ buckets {
     builders {
       name: "linux_asan_lsan"
       mixins: "linux"
+      mixins: "asan"
     }
     builders {
       name: "linux_msan"
       mixins: "linux"
+      mixins: "msan"
     }
     builders {
       name: "linux_no_v8"
       mixins: "linux"
+      mixins: "no_v8"
     }
     builders {
       name: "linux_skia"
       mixins: "linux"
+      mixins: "skia"
     }
     builders {
       name: "linux_xfa"
       mixins: "linux"
+      mixins: "xfa"
     }
     builders {
       name: "linux_xfa_asan_lsan"
       mixins: "linux"
+      mixins: "asan"
     }
     builders {
       name: "linux_xfa_jumbo"
       mixins: "linux"
+      mixins: "jumbo"
     }
     builders {
       name: "linux_xfa_msan"
       mixins: "linux"
+      mixins: "xfa"
+      mixins: "msan"
     }
     builders {
       name: "linux_xfa_rel"
       mixins: "linux"
+      mixins: "xfa"
+      mixins: "rel"
     }
     builders {
       name: "mac"
@@ -245,22 +367,29 @@ buckets {
     builders {
       name: "mac_no_v8"
       mixins: "mac"
+      mixins: "no_v8"
     }
     builders {
       name: "mac_skia"
       mixins: "mac"
+      mixins: "skia"
     }
     builders {
       name: "mac_xfa"
       mixins: "mac"
+      mixins: "xfa"
     }
     builders {
       name: "mac_xfa_jumbo"
       mixins: "mac"
+      mixins: "xfa"
+      mixins: "jumbo"
     }
     builders {
       name: "mac_xfa_rel"
       mixins: "mac"
+      mixins: "xfa"
+      mixins: "rel"
     }
     builders {
       name: "win"
@@ -269,42 +398,59 @@ buckets {
     builders {
       name: "win_asan"
       mixins: "win"
+      mixins: "asan"
     }
     builders {
       name: "win_no_v8"
       mixins: "win"
+      mixins: "no_v8"
     }
     builders {
       name: "win_skia"
       mixins: "win"
+      mixins: "skia"
     }
     builders {
       name: "win_xfa"
       mixins: "win"
+      mixins: "xfa"
     }
     builders {
       name: "win_xfa_32"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "x86"
     }
     builders {
       name: "win_xfa_asan"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "asan"
     }
     builders {
       name: "win_xfa_jumbo"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "jumbo"
     }
     builders {
       name: "win_xfa_msvc"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "msvc"
     }
     builders {
       name: "win_xfa_msvc_32"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "msvc"
+      mixins: "x86"
     }
     builders {
       name: "win_xfa_rel"
       mixins: "win"
+      mixins: "xfa"
+      mixins: "rel"
     }
   }
 }