Revert "Add compile_multilib properties to all native prebuilts."

This reverts commit 1e9c2677fdb3f1d615863d87c64ad9ea2fc9007b.

Reason for revert: Break build

Bug: 161315642
Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5

1 files changed, 3 insertions, 105 deletions

diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index 25d2a86a0..b168cd036 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -73,16 +73,12 @@ func TestSdkCompileMultilibOverride(t *testing.T) {
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
-			device_supported: false,
-			host_supported: true,
 			native_shared_libs: ["sdkmember"],
 			compile_multilib: "64",
 		}
 
 		cc_library_shared {
 			name: "sdkmember",
-			device_supported: false,
-			host_supported: true,
 			srcs: ["Test.cpp"],
 			stl: "none",
 			compile_multilib: "64",
@@ -90,52 +86,8 @@ func TestSdkCompileMultilibOverride(t *testing.T) {
 	`)
 
 	result.CheckSnapshot("mysdk", "",
-		checkAndroidBpContents(`
-// This is auto-generated. DO NOT EDIT.
-
-cc_prebuilt_library_shared {
-    name: "mysdk_sdkmember@current",
-    sdk_member_name: "sdkmember",
-    device_supported: false,
-    host_supported: true,
-    installable: false,
-    stl: "none",
-    compile_multilib: "64",
-    arch: {
-        x86_64: {
-            srcs: ["x86_64/lib/sdkmember.so"],
-        },
-    },
-}
-
-cc_prebuilt_library_shared {
-    name: "sdkmember",
-    prefer: false,
-    device_supported: false,
-    host_supported: true,
-    stl: "none",
-    compile_multilib: "64",
-    arch: {
-        x86_64: {
-            srcs: ["x86_64/lib/sdkmember.so"],
-        },
-    },
-}
-
-sdk_snapshot {
-    name: "mysdk@current",
-    device_supported: false,
-    host_supported: true,
-    native_shared_libs: ["mysdk_sdkmember@current"],
-    target: {
-        linux_glibc: {
-            compile_multilib: "64",
-        },
-    },
-}
-`),
 		checkAllCopyRules(`
-.intermediates/sdkmember/linux_glibc_x86_64_shared/sdkmember.so -> x86_64/lib/sdkmember.so
+.intermediates/sdkmember/android_arm64_armv8-a_shared/sdkmember.so -> arm64/lib/sdkmember.so
 `))
 }
 
@@ -319,7 +271,6 @@ cc_prebuilt_object {
     name: "mysdk_crtobj@current",
     sdk_member_name: "crtobj",
     stl: "none",
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/crtobj.o"],
@@ -334,7 +285,6 @@ cc_prebuilt_object {
     name: "crtobj",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/crtobj.o"],
@@ -428,7 +378,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "mynativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -445,7 +394,6 @@ cc_prebuilt_library_shared {
     name: "mynativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -679,9 +627,9 @@ cc_prebuilt_binary {
     host_supported: true,
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     static_executable: true,
     nocrt: true,
+    compile_multilib: "both",
     arch: {
         x86_64: {
             srcs: ["x86_64/bin/linker"],
@@ -698,9 +646,9 @@ cc_prebuilt_binary {
     device_supported: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     static_executable: true,
     nocrt: true,
+    compile_multilib: "both",
     arch: {
         x86_64: {
             srcs: ["x86_64/bin/linker"],
@@ -760,7 +708,6 @@ cc_prebuilt_library_shared {
     ],
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -782,7 +729,6 @@ cc_prebuilt_library_shared {
         "apex2",
     ],
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -884,7 +830,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "mynativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     shared_libs: [
         "mysdk_myothernativelib@current",
         "libc",
@@ -903,7 +848,6 @@ cc_prebuilt_library_shared {
     name: "mynativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     shared_libs: [
         "myothernativelib",
         "libc",
@@ -923,7 +867,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "myothernativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     system_shared_libs: ["libm"],
     arch: {
         arm64: {
@@ -939,7 +882,6 @@ cc_prebuilt_library_shared {
     name: "myothernativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     system_shared_libs: ["libm"],
     arch: {
         arm64: {
@@ -956,7 +898,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "mysystemnativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/mysystemnativelib.so"],
@@ -971,7 +912,6 @@ cc_prebuilt_library_shared {
     name: "mysystemnativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/mysystemnativelib.so"],
@@ -1043,7 +983,6 @@ cc_prebuilt_library_shared {
     installable: false,
     sdk_version: "minimum",
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1064,7 +1003,6 @@ cc_prebuilt_library_shared {
     host_supported: true,
     sdk_version: "minimum",
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1144,18 +1082,12 @@ cc_prebuilt_library_shared {
     installable: false,
     stl: "none",
     target: {
-        linux_glibc: {
-            compile_multilib: "both",
-        },
         linux_glibc_x86_64: {
             srcs: ["linux_glibc/x86_64/lib/mynativelib.so"],
         },
         linux_glibc_x86: {
             srcs: ["linux_glibc/x86/lib/mynativelib.so"],
         },
-        windows: {
-            compile_multilib: "64",
-        },
         windows_x86_64: {
             srcs: ["windows/x86_64/lib/mynativelib.dll"],
         },
@@ -1169,18 +1101,12 @@ cc_prebuilt_library_shared {
     host_supported: true,
     stl: "none",
     target: {
-        linux_glibc: {
-            compile_multilib: "both",
-        },
         linux_glibc_x86_64: {
             srcs: ["linux_glibc/x86_64/lib/mynativelib.so"],
         },
         linux_glibc_x86: {
             srcs: ["linux_glibc/x86/lib/mynativelib.so"],
         },
-        windows: {
-            compile_multilib: "64",
-        },
         windows_x86_64: {
             srcs: ["windows/x86_64/lib/mynativelib.dll"],
         },
@@ -1237,7 +1163,6 @@ cc_prebuilt_library_static {
     sdk_member_name: "mynativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -1255,7 +1180,6 @@ cc_prebuilt_library_static {
     name: "mynativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -1327,7 +1251,6 @@ cc_prebuilt_library_static {
     host_supported: true,
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1347,7 +1270,6 @@ cc_prebuilt_library_static {
     device_supported: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1408,7 +1330,6 @@ cc_prebuilt_library {
     sdk_member_name: "mynativelib",
     installable: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -1434,7 +1355,6 @@ cc_prebuilt_library {
     name: "mynativelib",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
     arch: {
         arm64: {
@@ -1514,7 +1434,6 @@ cc_prebuilt_library_static {
     host_supported: true,
     installable: false,
     stl: "none",
-    compile_multilib: "64",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1530,7 +1449,6 @@ cc_prebuilt_library_static {
     device_supported: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "64",
     export_include_dirs: ["include/include"],
     arch: {
         x86_64: {
@@ -1583,7 +1501,6 @@ cc_prebuilt_library_headers {
     name: "mysdk_mynativeheaders@current",
     sdk_member_name: "mynativeheaders",
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
 }
 
@@ -1591,7 +1508,6 @@ cc_prebuilt_library_headers {
     name: "mynativeheaders",
     prefer: false,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
 }
 
@@ -1637,7 +1553,6 @@ cc_prebuilt_library_headers {
     device_supported: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
 }
 
@@ -1647,7 +1562,6 @@ cc_prebuilt_library_headers {
     device_supported: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     export_include_dirs: ["include/include"],
 }
 
@@ -1700,7 +1614,6 @@ cc_prebuilt_library_headers {
     sdk_member_name: "mynativeheaders",
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     export_system_include_dirs: ["common_os/include/include"],
     target: {
         android: {
@@ -1717,7 +1630,6 @@ cc_prebuilt_library_headers {
     prefer: false,
     host_supported: true,
     stl: "none",
-    compile_multilib: "both",
     export_system_include_dirs: ["common_os/include/include"],
     target: {
         android: {
@@ -1777,7 +1689,6 @@ cc_prebuilt_library_shared {
     name: "mysdk_sslnil@current",
     sdk_member_name: "sslnil",
     installable: false,
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/sslnil.so"],
@@ -1791,7 +1702,6 @@ cc_prebuilt_library_shared {
 cc_prebuilt_library_shared {
     name: "sslnil",
     prefer: false,
-    compile_multilib: "both",
     arch: {
         arm64: {
             srcs: ["arm64/lib/sslnil.so"],
@@ -1806,7 +1716,6 @@ cc_prebuilt_library_shared {
     name: "mysdk_sslempty@current",
     sdk_member_name: "sslempty",
     installable: false,
-    compile_multilib: "both",
     system_shared_libs: [],
     arch: {
         arm64: {
@@ -1821,7 +1730,6 @@ cc_prebuilt_library_shared {
 cc_prebuilt_library_shared {
     name: "sslempty",
     prefer: false,
-    compile_multilib: "both",
     system_shared_libs: [],
     arch: {
         arm64: {
@@ -1837,7 +1745,6 @@ cc_prebuilt_library_shared {
     name: "mysdk_sslnonempty@current",
     sdk_member_name: "sslnonempty",
     installable: false,
-    compile_multilib: "both",
     system_shared_libs: ["mysdk_sslnil@current"],
     arch: {
         arm64: {
@@ -1852,7 +1759,6 @@ cc_prebuilt_library_shared {
 cc_prebuilt_library_shared {
     name: "sslnonempty",
     prefer: false,
-    compile_multilib: "both",
     system_shared_libs: ["sslnil"],
     arch: {
         arm64: {
@@ -1901,7 +1807,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "sslvariants",
     host_supported: true,
     installable: false,
-    compile_multilib: "both",
     target: {
         android: {
             system_shared_libs: [],
@@ -1925,7 +1830,6 @@ cc_prebuilt_library_shared {
     name: "sslvariants",
     prefer: false,
     host_supported: true,
-    compile_multilib: "both",
     target: {
         android: {
             system_shared_libs: [],
@@ -1982,7 +1886,6 @@ cc_prebuilt_library_shared {
     name: "mysdk_stubslib@current",
     sdk_member_name: "stubslib",
     installable: false,
-    compile_multilib: "both",
     stubs: {
         versions: ["3"],
     },
@@ -1999,7 +1902,6 @@ cc_prebuilt_library_shared {
 cc_prebuilt_library_shared {
     name: "stubslib",
     prefer: false,
-    compile_multilib: "both",
     stubs: {
         versions: ["3"],
     },
@@ -2056,7 +1958,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "stubslib",
     host_supported: true,
     installable: false,
-    compile_multilib: "both",
     stubs: {
         versions: ["3"],
     },
@@ -2080,7 +1981,6 @@ cc_prebuilt_library_shared {
     name: "stubslib",
     prefer: false,
     host_supported: true,
-    compile_multilib: "both",
     stubs: {
         versions: ["3"],
     },
@@ -2136,7 +2036,6 @@ cc_prebuilt_library_shared {
     host_supported: true,
     installable: false,
     unique_host_soname: true,
-    compile_multilib: "both",
     target: {
         android_arm64: {
             srcs: ["android/arm64/lib/mylib.so"],
@@ -2158,7 +2057,6 @@ cc_prebuilt_library_shared {
     prefer: false,
     host_supported: true,
     unique_host_soname: true,
-    compile_multilib: "both",
     target: {
         android_arm64: {
             srcs: ["android/arm64/lib/mylib.so"],