Merge "Revert "Add compile_multilib properties to all native prebuilts.""

android/sdk.go

@@ -466,7 +466,8 @@ func RegisterSdkMemberType(memberType SdkMemberType) {
 
 // Base structure for all implementations of SdkMemberProperties.
 //
-// Contains common properties that apply across many different member types.
+// Contains common properties that apply across many different member types. These
+// are not affected by the optimization to extract common values.
 type SdkMemberPropertiesBase struct {
 	// The number of unique os types supported by the member variants.
 	//
@@ -488,7 +489,9 @@ type SdkMemberPropertiesBase struct {
 	Os OsType `sdk:"keep"`
 
 	// The setting to use for the compile_multilib property.
-	Compile_multilib string `android:"arch_variant"`
+	//
+	// This property is set after optimization so there is no point in trying to optimize it.
+	Compile_multilib string `sdk:"keep"`
 }
 
 // The os prefix to use for any file paths in the sdk.

cc/binary_sdk_member.go

@@ -140,6 +140,10 @@ func (p *nativeBinaryInfoProperties) PopulateFromVariant(ctx android.SdkMemberCo
 }
 
 func (p *nativeBinaryInfoProperties) AddToPropertySet(ctx android.SdkMemberContext, propertySet android.BpPropertySet) {
+	if p.Compile_multilib != "" {
+		propertySet.AddProperty("compile_multilib", p.Compile_multilib)
+	}
+
 	builder := ctx.SnapshotBuilder()
 	if p.outputFile != nil {
 		propertySet.AddProperty("srcs", []string{nativeBinaryPathFor(*p)})

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"],

sdk/update.go

@@ -794,17 +794,6 @@ func (s *snapshotBuilder) isInternalMember(memberName string) bool {
 	return !ok
 }
 
-// Add the properties from the given SdkMemberProperties to the blueprint
-// property set. This handles common properties in SdkMemberPropertiesBase and
-// calls the member-specific AddToPropertySet for the rest.
-func addSdkMemberPropertiesToSet(ctx *memberContext, memberProperties android.SdkMemberProperties, targetPropertySet android.BpPropertySet) {
-	if memberProperties.Base().Compile_multilib != "" {
-		targetPropertySet.AddProperty("compile_multilib", memberProperties.Base().Compile_multilib)
-	}
-
-	memberProperties.AddToPropertySet(ctx, targetPropertySet)
-}
-
 type sdkMemberRef struct {
 	memberType android.SdkMemberType
 	variant    android.SdkAware
@@ -1020,7 +1009,7 @@ func (osInfo *osTypeSpecificInfo) addToPropertySet(ctx *memberContext, bpModule
 	}
 
 	// Add the os specific but arch independent properties to the module.
-	addSdkMemberPropertiesToSet(ctx, osInfo.Properties, osPropertySet)
+	osInfo.Properties.AddToPropertySet(ctx, osPropertySet)
 
 	// Add arch (and possibly os) specific sections for each set of arch (and possibly
 	// os) specific properties.
@@ -1122,11 +1111,11 @@ func (archInfo *archTypeSpecificInfo) optimizeProperties(ctx *memberContext, com
 func (archInfo *archTypeSpecificInfo) addToPropertySet(ctx *memberContext, archPropertySet android.BpPropertySet, archOsPrefix string) {
 	archTypeName := archInfo.archType.Name
 	archTypePropertySet := archPropertySet.AddPropertySet(archOsPrefix + archTypeName)
-	addSdkMemberPropertiesToSet(ctx, archInfo.Properties, archTypePropertySet)
+	archInfo.Properties.AddToPropertySet(ctx, archTypePropertySet)
 
 	for _, linkInfo := range archInfo.linkInfos {
 		linkPropertySet := archTypePropertySet.AddPropertySet(linkInfo.linkType)
-		addSdkMemberPropertiesToSet(ctx, linkInfo.Properties, linkPropertySet)
+		linkInfo.Properties.AddToPropertySet(ctx, linkPropertySet)
 	}
 }
 
@@ -1232,7 +1221,7 @@ func (s *sdk) createMemberSnapshot(ctx *memberContext, member *sdkMember, bpModu
 	extractCommonProperties(ctx.sdkMemberContext, commonValueExtractor, commonProperties, osSpecificPropertiesContainers)
 
 	// Add the common properties to the module.
-	addSdkMemberPropertiesToSet(ctx, commonProperties, bpModule)
+	commonProperties.AddToPropertySet(ctx, bpModule)
 
 	// Create a target property set into which target specific properties can be
 	// added.