Update Pixel 2 XL to Android P

Bug: skia:
Change-Id: Ib3616e1504175b7862ad0a78837cc8eca7a8deb9
Reviewed-on: https://skia-review.googlesource.com/149227
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

Author: kjlubick

infra/bots/gen_tasks.go

@@ -314,7 +314,7 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri
 		Dependencies: []string{BUNDLE_RECIPES_NAME},
 		Dimensions:   dimensions,
 		EnvPrefixes: map[string][]string{
-			"PATH":                    []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
+			"PATH": []string{"cipd_bin_packages", "cipd_bin_packages/bin"},
 			"VPYTHON_VIRTUALENV_ROOT": []string{"cache/vpython"},
 		},
 		ExtraTags: map[string]string{
@@ -476,7 +476,7 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 				"Nexus7":          {"grouper", "LMY47V_1836172"}, // 2012 Nexus 7
 				"NexusPlayer":     {"fugu", "OPR2.170623.027"},
 				"Pixel":           {"sailfish", "PPR1.180610.009"},
-				"Pixel2XL":        {"taimen", "OPM4.171019.016.B1"},
+				"Pixel2XL":        {"taimen", "PPR1.180610.009"},
 			}[parts["model"]]
 			if !ok {
 				glog.Fatalf("Entry %q not found in Android mapping.", parts["model"])

infra/bots/tasks.json

@@ -23037,7 +23037,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23137,7 +23137,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23237,7 +23237,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23335,7 +23335,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23433,7 +23433,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23533,7 +23533,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -23631,7 +23631,7 @@
         "Housekeeper-PerCommit-IsolateSKP"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -46587,7 +46587,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -46687,7 +46687,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -46787,7 +46787,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -46887,7 +46887,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -46987,7 +46987,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"
@@ -47087,7 +47087,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPM4.171019.016.B1",
+        "device_os:PPR1.180610.009",
         "device_type:taimen",
         "os:Android",
         "pool:Skia"