StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the use of version scripts with header-abi-linker."

Browse Source
This commit is contained in:
Jayant Chowdhary
2018-01-18 17:51:33 +00:00
committed by Gerrit Code Review
parent b5b5b2667d df344d57b0
commit 85935a2f9c
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cc/builder.go
View File

@@ -187,12 +187,12 @@ var (
sAbiLink = pctx.AndroidStaticRule("sAbiLink", sAbiLink = pctx.AndroidStaticRule("sAbiLink",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$sAbiLinker -o ${out} $symbolFilter -arch $arch -api $api $exportedHeaderFlags @${out}.rsp ", Command: "$sAbiLinker -o ${out} $symbolFilter -arch $arch $exportedHeaderFlags @${out}.rsp ",
CommandDeps: []string{"$sAbiLinker"}, CommandDeps: []string{"$sAbiLinker"},
Rspfile: "${out}.rsp", Rspfile: "${out}.rsp",
RspfileContent: "${in}", RspfileContent: "${in}",
}, },
"symbolFilter", "arch", "api", "exportedHeaderFlags") "symbolFilter", "arch", "exportedHeaderFlags")
_ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff") _ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff")
@@ -681,27 +681,18 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
// Generate a rule to combine .dump sAbi dump files from multiple source files // Generate a rule to combine .dump sAbi dump files from multiple source files
// into a single .ldump sAbi dump file // into a single .ldump sAbi dump file
func TransformDumpToLinkedDump(ctx android.ModuleContext, sAbiDumps android.Paths, soFile android.Path, func TransformDumpToLinkedDump(ctx android.ModuleContext, sAbiDumps android.Paths, soFile android.Path,
symbolFile android.OptionalPath, apiLevel, baseName, exportedHeaderFlags string) android.OptionalPath { baseName, exportedHeaderFlags string) android.OptionalPath {
outputFile := android.PathForModuleOut(ctx, baseName+".lsdump") outputFile := android.PathForModuleOut(ctx, baseName+".lsdump")
var symbolFilterStr string symbolFilterStr := "-so " + soFile.String()
var linkedDumpDep android.Path
if symbolFile.Valid() {
symbolFilterStr = "-v " + symbolFile.Path().String()
linkedDumpDep = symbolFile.Path()
} else {
linkedDumpDep = soFile
symbolFilterStr = "-so " + soFile.String()
}
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: sAbiLink, Rule: sAbiLink,
Description: "header-abi-linker " + outputFile.Base(), Description: "header-abi-linker " + outputFile.Base(),
Output: outputFile, Output: outputFile,
Inputs: sAbiDumps, Inputs: sAbiDumps,
Implicit: linkedDumpDep, Implicit: soFile,
Args: map[string]string{ Args: map[string]string{
"symbolFilter": symbolFilterStr, "symbolFilter": symbolFilterStr,
"arch": ctx.Arch().ArchType.Name, "arch": ctx.Arch().ArchType.Name,
"api": apiLevel,
"exportedHeaderFlags": exportedHeaderFlags, "exportedHeaderFlags": exportedHeaderFlags,
}, },
}) })

7
cc/library.go
View File

@@ -620,11 +620,6 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
//Also take into account object re-use. //Also take into account object re-use.
if len(objs.sAbiDumpFiles) > 0 && ctx.createVndkSourceAbiDump() { if len(objs.sAbiDumpFiles) > 0 && ctx.createVndkSourceAbiDump() {
refSourceDumpFile := android.PathForVndkRefAbiDump(ctx, "current", fileName, vndkVsNdk(ctx), true) refSourceDumpFile := android.PathForVndkRefAbiDump(ctx, "current", fileName, vndkVsNdk(ctx), true)
versionScript := android.OptionalPathForModuleSrc(ctx, library.Properties.Version_script)
var symbolFile android.OptionalPath
if versionScript.Valid() {
symbolFile = versionScript
}
exportIncludeDirs := library.flagExporter.exportedIncludes(ctx) exportIncludeDirs := library.flagExporter.exportedIncludes(ctx)
var SourceAbiFlags []string var SourceAbiFlags []string
for _, dir := range exportIncludeDirs.Strings() { for _, dir := range exportIncludeDirs.Strings() {
@@ -634,7 +629,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objec
SourceAbiFlags = append(SourceAbiFlags, reexportedInclude) SourceAbiFlags = append(SourceAbiFlags, reexportedInclude)
} }
exportedHeaderFlags := strings.Join(SourceAbiFlags, " ") exportedHeaderFlags := strings.Join(SourceAbiFlags, " ")
library.sAbiOutputFile = TransformDumpToLinkedDump(ctx, objs.sAbiDumpFiles, soFile, symbolFile, "current", fileName, exportedHeaderFlags) library.sAbiOutputFile = TransformDumpToLinkedDump(ctx, objs.sAbiDumpFiles, soFile, fileName, exportedHeaderFlags)
if refSourceDumpFile.Valid() { if refSourceDumpFile.Valid() {
unzippedRefDump := UnzipRefDump(ctx, refSourceDumpFile.Path(), fileName) unzippedRefDump := UnzipRefDump(ctx, refSourceDumpFile.Path(), fileName)
library.sAbiDiff = SourceAbiDiff(ctx, library.sAbiOutputFile.Path(), unzippedRefDump, fileName) library.sAbiDiff = SourceAbiDiff(ctx, library.sAbiOutputFile.Path(), unzippedRefDump, fileName)