1 files changed, 19 insertions, 8 deletions

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 7e598bf81e..d0f71d5cbc 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -31,6 +31,7 @@ builder_mixins {
 
 builder_mixins {
   name: "skia"
+  mixins: "skip_test"
   recipe {
     properties_j: "skia:true"
   }
@@ -52,6 +53,7 @@ builder_mixins {
 
 builder_mixins {
   name: "msan"
+  mixins: "rel"
   recipe {
     properties: "memory_tool:msan"
   }
@@ -106,6 +108,15 @@ builder_mixins {
   }
 }
 
+builder_mixins {
+  name: "win_asan"
+  mixins: "win"
+  mixins: "asan"
+  mixins: "clang"
+  mixins: "x86"
+  mixins: "rel"
+}
+
 acl_sets {
   name: "ci"
   acls {
@@ -168,6 +179,7 @@ buckets {
     builders {
       name: "android"
       mixins: "android"
+      mixins: "skip_test"
     }
     builders {
       name: "linux"
@@ -233,9 +245,8 @@ buckets {
     }
     builders {
       name: "win_xfa_asan"
-      mixins: "win"
+      mixins: "win_asan"
       mixins: "xfa"
-      mixins: "asan"
     }
     builders {
       name: "windows"
@@ -243,8 +254,7 @@ buckets {
     }
     builders {
       name: "windows_asan"
-      mixins: "win"
-      mixins: "asan"
+      mixins: "win_asan"
     }
     builders {
       name: "windows_no_v8"
@@ -265,6 +275,7 @@ buckets {
     builders {
       name: "windows_xfa_msvc"
       mixins: "win"
+      mixins: "xfa"
       mixins: "msvc"
     }
     builders {
@@ -341,11 +352,13 @@ buckets {
     builders {
       name: "linux_xfa_asan_lsan"
       mixins: "linux"
+      mixins: "xfa"
       mixins: "asan"
     }
     builders {
       name: "linux_xfa_jumbo"
       mixins: "linux"
+      mixins: "xfa"
       mixins: "jumbo"
     }
     builders {
@@ -397,8 +410,7 @@ buckets {
     }
     builders {
       name: "win_asan"
-      mixins: "win"
-      mixins: "asan"
+      mixins: "win_asan"
     }
     builders {
       name: "win_no_v8"
@@ -423,9 +435,8 @@ buckets {
     }
     builders {
       name: "win_xfa_asan"
-      mixins: "win"
+      mixins: "win_asan"
       mixins: "xfa"
-      mixins: "asan"
     }
     builders {
       name: "win_xfa_jumbo"