Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ebe5d10 authored Mar 09, 2018 by Jayant Chowdhary Committed by Gerrit Code Review Mar 09, 2018

Merge "Consider binder bitness while looking for abi references."

parents 6424d17a 34ce67d4

android/config.go

+8 −0

Original line number	Diff line number	Diff line
		@@ -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

android/paths.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)
		}