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

Merge "Add informational message to help with updation of VNDK abi references." into pi-dev

Browse Source
This commit is contained in:
Jayant Chowdhary
2018-04-10 17:35:27 +00:00
committed by Android (Google) Code Review
parent d95159cb33 e3ee2f5e67
commit 195f53c0f2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/builder.go
View File

@@ -200,10 +200,12 @@ var (
commandStr := "($sAbiDiffer $allowFlags -lib $libName -arch $arch -check-all-apis -o ${out} -new $in -old $referenceDump)" commandStr := "($sAbiDiffer $allowFlags -lib $libName -arch $arch -check-all-apis -o ${out} -new $in -old $referenceDump)"
distDir := config.ProductVariables.DistDir distDir := config.ProductVariables.DistDir
commandStr += " || (echo ' ---- Please update abi references by running platform/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l ${libName} ----'"
if distDir != nil && *distDir != "" { if distDir != nil && *distDir != "" {
distAbiDiffDir := *distDir + "/abidiffs/" distAbiDiffDir := *distDir + "/abidiffs/"
commandStr += " || (mkdir -p " + distAbiDiffDir + " && cp ${out} " + distAbiDiffDir + " && exit 1)" commandStr += " && (mkdir -p " + distAbiDiffDir + " && cp ${out} " + distAbiDiffDir + ")"
} }
commandStr += " && exit 1)"
return blueprint.RuleParams{ return blueprint.RuleParams{
Command: commandStr, Command: commandStr,
CommandDeps: []string{"$sAbiDiffer"}, CommandDeps: []string{"$sAbiDiffer"},
@@ -738,7 +740,7 @@ func SourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
Implicit: referenceDump, Implicit: referenceDump,
Args: map[string]string{ Args: map[string]string{
"referenceDump": referenceDump.String(), "referenceDump": referenceDump.String(),
"libName": baseName, "libName": baseName[0:(len(baseName) - len(filepath.Ext(baseName)))],
"arch": ctx.Arch().ArchType.Name, "arch": ctx.Arch().ArchType.Name,
"allowFlags": strings.Join(localAbiCheckAllowFlags, " "), "allowFlags": strings.Join(localAbiCheckAllowFlags, " "),
}, },