Revert "Fix snapshot of a host/device cc_library with stubs"

Revert submission 1302576

Bug: 156054601
Reason for revert: Presumed root cause of build break.
Reverted Changes:
Ifc8116e11:Detect invalid arch specific properties in snapsho...
I7ebd33307:Adds support for 'ignored-on-host'
I167b47a13:Fix snapshot of a host/device cc_library with stub...

Change-Id: Ibccce5286605bb71c6be3b3550ba86d8b7e24fa7

cc/library_sdk_member.go

@@ -342,11 +342,7 @@ type nativeLibInfoProperties struct {
 
 	// The specific stubs version for the lib variant, or empty string if stubs
 	// are not in use.
-	//
-	// Marked 'ignored-on-host' as the StubsVersion() from which this is initialized is
-	// not set on host and the stubs.versions property which this is written to is does
-	// not vary by arch so cannot be android specific.
-	StubsVersion string `sdk:"ignored-on-host"`
+	StubsVersion string
 
 	// outputFile is not exported as it is always arch specific.
 	outputFile android.Path

sdk/cc_sdk_test.go

@@ -1805,86 +1805,3 @@ sdk_snapshot {
 }
 `))
 }
-
-func TestDeviceAndHostSnapshotWithStubsLibrary(t *testing.T) {
-	result := testSdkWithCc(t, `
-		sdk {
-			name: "mysdk",
-			host_supported: true,
-			native_shared_libs: ["stubslib"],
-		}
-
-		cc_library {
-			name: "internaldep",
-			host_supported: true,
-		}
-
-		cc_library {
-			name: "stubslib",
-			host_supported: true,
-			shared_libs: ["internaldep"],
-			stubs: {
-				symbol_file: "some/where/stubslib.map.txt",
-				versions: ["1", "2", "3"],
-			},
-		}
-	`)
-
-	result.CheckSnapshot("mysdk", "",
-		checkAndroidBpContents(`
-// This is auto-generated. DO NOT EDIT.
-
-cc_prebuilt_library_shared {
-    name: "mysdk_stubslib@current",
-    sdk_member_name: "stubslib",
-    host_supported: true,
-    installable: false,
-    stubs: {
-        versions: ["3"],
-    },
-    target: {
-        android_arm64: {
-            srcs: ["android/arm64/lib/stubslib.so"],
-        },
-        android_arm: {
-            srcs: ["android/arm/lib/stubslib.so"],
-        },
-        linux_glibc_x86_64: {
-            srcs: ["linux_glibc/x86_64/lib/stubslib.so"],
-        },
-        linux_glibc_x86: {
-            srcs: ["linux_glibc/x86/lib/stubslib.so"],
-        },
-    },
-}
-
-cc_prebuilt_library_shared {
-    name: "stubslib",
-    prefer: false,
-    host_supported: true,
-    stubs: {
-        versions: ["3"],
-    },
-    target: {
-        android_arm64: {
-            srcs: ["android/arm64/lib/stubslib.so"],
-        },
-        android_arm: {
-            srcs: ["android/arm/lib/stubslib.so"],
-        },
-        linux_glibc_x86_64: {
-            srcs: ["linux_glibc/x86_64/lib/stubslib.so"],
-        },
-        linux_glibc_x86: {
-            srcs: ["linux_glibc/x86/lib/stubslib.so"],
-        },
-    },
-}
-
-sdk_snapshot {
-    name: "mysdk@current",
-    host_supported: true,
-    native_shared_libs: ["mysdk_stubslib@current"],
-}
-`))
-}

sdk/update.go

@@ -982,13 +982,6 @@ func (osInfo *osTypeSpecificInfo) addToPropertySet(ctx *memberContext, bpModule
 	}
 }
 
-func (osInfo *osTypeSpecificInfo) isHostVariant() bool {
-	osClass := osInfo.osType.Class
-	return osClass == android.Host || osClass == android.HostCross
-}
-
-var _ isHostVariant = (*osTypeSpecificInfo)(nil)
-
 func (osInfo *osTypeSpecificInfo) String() string {
 	return fmt.Sprintf("OsType{%s}", osInfo.osType)
 }