openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix mismatch between cc and python for windows prefer32" am: 9b564c5a22 am: 0448d58125 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ec331d9a8b4859ebd8713c2bd26c4e97e2b62bf
This commit is contained in:
Colin Cross 2021-01-23 00:06:56 +00:00 committed by Automerger Merge Worker
parent e261b61f78 0448d58125
commit a5085a5fd1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/arch.go
View File

@ -617,11 +617,15 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) {
}
// Some modules want compile_multilib: "first" to mean 32-bit, not 64-bit.
// This is used for Windows support and for HOST_PREFER_32_BIT=true support for Art modules.
// This is used for HOST_PREFER_32_BIT=true support for Art modules.
prefer32 := false
if base.prefer32 != nil {
prefer32 = base.prefer32(mctx, base, os)
}
if os == Windows {
// Windows builds always prefer 32-bit
prefer32 = true
}
// Determine the multilib selection for this module.
multilib, extraMultilib := decodeMultilib(base, os.Class)

4
cc/cc.go
View File

@ -1043,10 +1043,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)