Fix mismatch between cc and python for windows prefer32
Windows prefer32 was implemented in cc, which caused a mismatch between cc and other packages like python. This manifested as missing variant when a python_test_host with compile_multilib: "first" tried to depend on a cc_binary_host, which implicitly has multilib "first". Fixes: 177904375 Test: m checkbuild Change-Id: Iaaac16ae171c06d90d04d7cac11789d3f39b8d99
This commit is contained in:
4
cc/cc.go
4
cc/cc.go
@@ -1012,10 +1012,6 @@ func (c *Module) Init() android.Module {
|
||||
c.AddProperties(feature.props()...)
|
||||
}
|
||||
|
||||
c.Prefer32(func(ctx android.BaseModuleContext, base *android.ModuleBase, os android.OsType) bool {
|
||||
// Windows builds always prefer 32-bit
|
||||
return os == android.Windows
|
||||
})
|
||||
android.InitAndroidArchModule(c, c.hod, c.multilib)
|
||||
android.InitApexModule(c)
|
||||
android.InitSdkAwareModule(c)
|
||||
|
Reference in New Issue
Block a user