Delete Android compile bots

Bug: skia:10553
Change-Id: I2fd1d5c309b88b0c9e3ce26392ede9fcd2aa6fba
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306853
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>

Author: rmistry

infra/bots/android_compile/trigger_wait_ac_task.py

@@ -392,10 +392,7 @@ func (b *taskBuilder) kitchenTaskNoBundle(recipe string, outputDir string) {
 	}
 
 	// Attempts.
-	if b.extraConfig("Framework") && b.extraConfig("Android", "G3") {
-		// Both bots can be long running. No need to retry them.
-		b.attempts(1)
-	} else if !b.role("Build", "Upload") && b.extraConfig("ASAN", "MSAN", "TSAN", "Valgrind") {
+	if !b.role("Build", "Upload") && b.extraConfig("ASAN", "MSAN", "TSAN", "Valgrind") {
 		// Sanitizers often find non-deterministic issues that retries would hide.
 		b.attempts(1)
 	} else {
@@ -1164,21 +1161,6 @@ func (b *jobBuilder) housekeeper() {
 	})
 }
 
-// androidFrameworkCompile generates an Android Framework Compile task. Returns
-// the name of the last task in the generated chain of tasks, which the Job
-// should add as a dependency.
-func (b *jobBuilder) androidFrameworkCompile() {
-	b.addTask(b.Name, func(b *taskBuilder) {
-		b.recipeProps(EXTRA_PROPS)
-		b.kitchenTask("android_compile", OUTPUT_NONE)
-		b.isolate("compile_android_framework.isolate")
-		b.serviceAccount("skia-android-framework-compile@skia-swarming-bots.iam.gserviceaccount.com")
-		b.linuxGceDimensions(MACHINE_TYPE_SMALL)
-		b.timeout(2 * time.Hour)
-		b.usesGit()
-	})
-}
-
 // g3FrameworkCanary generates a G3 Framework Canary task. Returns
 // the name of the last task in the generated chain of tasks, which the Job
 // should add as a dependency.

infra/bots/gen_tasks_logic/gen_tasks_logic.go

@@ -154,14 +154,8 @@ func (b *jobBuilder) genTasksForJob() {
 
 	// Compile bots.
 	if b.role("Build") {
-		if b.extraConfig("Android") && b.extraConfig("Framework") {
-			// Android Framework compile tasks use a different recipe.
-			b.androidFrameworkCompile()
-			return
-		} else {
-			b.compile()
-			return
-		}
+		b.compile()
+		return
 	}
 
 	// BuildStats bots. This computes things like binary size.
@@ -228,7 +222,7 @@ func (b *jobBuilder) finish() {
 		b.trigger(specs.TRIGGER_WEEKLY)
 	} else if b.extraConfig("Flutter", "CommandBuffer") {
 		b.trigger(specs.TRIGGER_MASTER_ONLY)
-	} else if b.frequency("OnDemand") || (b.extraConfig("Framework") && b.extraConfig("Android", "G3") || b.role("Canary")) {
+	} else if b.frequency("OnDemand") || b.role("Canary") {
 		b.trigger(specs.TRIGGER_ON_DEMAND)
 	} else {
 		b.trigger(specs.TRIGGER_ANY_BRANCH)

infra/bots/gen_tasks_logic/job_builder.go

@@ -23,8 +23,6 @@
   "Build-Debian10-Clang-arm64-Release-Android",
   "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
   "Build-Debian10-Clang-arm64-Release-Android_Wuffs",
-  "Build-Debian10-Clang-cf_x86_phone-eng-Android_Framework",
-  "Build-Debian10-Clang-host-sdk-Android_Framework",
   "Build-Debian10-Clang-x64-Debug-Android",
   "Build-Debian10-Clang-x64-Release-Android",
   "Build-Debian10-Clang-x86-Debug",