Revert "Add compile_multilib properties to all native prebuilts."
This reverts commit 1e9c2677fdb3f1d615863d87c64ad9ea2fc9007b.
Reason for revert: Break build
Bug: 161315642
Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5
diff --git a/sdk/update.go b/sdk/update.go
index c80d7d3..8241151 100644
--- a/sdk/update.go
+++ b/sdk/update.go
@@ -794,17 +794,6 @@
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 @@
}
// 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) 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 @@
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.