Revert "Flag to control if generated SDK prebuilts are preferred."

This reverts commit d0b99cea0ac389e831dfddbd3cb10fa09a040d2c.

Reason for revert: Not needed anymore. We will simple exclude the 
gernated Android.bp files from prebuilt drops instead, it keeps
things simpler.

Change-Id: I5b01b2e01197f9fceb4630c8ade95f0d1d0f33f4

1 files changed, 0 insertions, 65 deletions

diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index 0933db28a..a13b0d7d0 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -662,68 +662,3 @@ sdk_snapshot {
 		)
 	})
 }
-
-// Ensure that sdk prebuilt_prefer works correctly.
-func TestSnapshot_PrebuiltPreferTrue(t *testing.T) {
-	bp := `
-		sdk {
-			name: "mysdk",
-			java_header_libs: ["myjavalib"],
-			prebuilts_prefer: true,
-		}
-
-		java_library {
-			name: "myjavalib",
-			srcs: ["Test.java"],
-			system_modules: "none",
-			sdk_version: "none",
-			compile_dex: true,
-			host_supported: true,
-		}
-	`
-	preparer := android.GroupFixturePreparers(
-		prepareForSdkTestWithJava,
-		android.FixtureWithRootAndroidBp(bp),
-	)
-
-	checkZipFile := func(t *testing.T, result *android.TestResult, expected string) {
-		zipRule := result.ModuleForTests("mysdk", "common_os").Rule("SnapshotZipFiles")
-		android.AssertStringEquals(t, "snapshot zip file", expected, zipRule.Output.String())
-	}
-
-	t.Run("prefer=true", func(t *testing.T) {
-		result := android.GroupFixturePreparers(
-			preparer,
-		).RunTest(t)
-
-		checkZipFile(t, result, "out/soong/.intermediates/mysdk/common_os/mysdk-current.zip")
-
-		CheckSnapshot(t, result, "mysdk", "",
-			checkAndroidBpContents(`
-// This is auto-generated. DO NOT EDIT.
-
-java_import {
-    name: "mysdk_myjavalib@current",
-    sdk_member_name: "myjavalib",
-    visibility: ["//visibility:public"],
-    apex_available: ["//apex_available:platform"],
-    jars: ["java/myjavalib.jar"],
-}
-
-java_import {
-    name: "myjavalib",
-    prefer: true,
-    visibility: ["//visibility:public"],
-    apex_available: ["//apex_available:platform"],
-    jars: ["java/myjavalib.jar"],
-}
-
-sdk_snapshot {
-    name: "mysdk@current",
-    visibility: ["//visibility:public"],
-    java_header_libs: ["mysdk_myjavalib@current"],
-}
-			`),
-		)
-	})
-}