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 "Consider binder bitness while looking for abi references."

This commit is contained in:
Jayant Chowdhary 2018-03-09 03:11:01 +00:00 committed by Gerrit Code Review
parent 6424d17a2d 34ce67d454
commit 7ebe5d10ad
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@ -649,6 +649,14 @@ func (c *deviceConfig) Arches() []Arch {
return arches
}
func (c *deviceConfig) BinderBitness() string {
is32BitBinder := c.config.ProductVariables.Binder32bit
if is32BitBinder != nil && *is32BitBinder {
return "32"
}
return "64"
}
func (c *deviceConfig) VendorPath() string {
if c.config.ProductVariables.VendorPath != nil {
return *c.config.ProductVariables.VendorPath

4
android/paths.go
View File

@ -800,8 +800,8 @@ func PathForVndkRefAbiDump(ctx ModuleContext, version, fileName string, vndkOrNd
if len(arches) == 0 {
panic("device build with no primary arch")
}
primary_arch := arches[0].ArchType.String()
refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + primary_arch + "/" +
binderBitness := ctx.DeviceConfig().BinderBitness()
refDumpFileStr := "prebuilts/abi-dumps/" + vndkOrNdkDir + "/" + version + "/" + binderBitness + "/" +
archNameAndVariant + "/" + sourceOrBinaryDir + "/" + fileName + ext
return ExistentPathForSource(ctx, refDumpFileStr)
}