tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add informational message to help with updation of VNDK abi references." am: bc30a77591

Browse source 
am: dcd9c60461

Change-Id: I188545b2c980001e4f87ffe3e6d0fb070ae898e4
This commit is contained in:
Jayant Chowdhary 2018-04-04 17:14:44 -07:00 committed by android-build-merger
commit c29ca8e329
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/builder.go
View file

@ -203,9 +203,11 @@ 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)"
distAbiDiffDir := android.PathForDist(ctx, "abidiffs") distAbiDiffDir := android.PathForDist(ctx, "abidiffs")
commandStr += "|| (echo ' ---- Please update abi references by running platform/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l ${libName} ----'"
if distAbiDiffDir.Valid() { if distAbiDiffDir.Valid() {
commandStr += " || (mkdir -p " + distAbiDiffDir.String() + " && cp ${out} " + distAbiDiffDir.String() + " && exit 1)" commandStr += ") && (mkdir -p " + distAbiDiffDir.String() + " && cp ${out} " + distAbiDiffDir.String()
} }
commandStr += " && exit 1)"
return blueprint.RuleParams{ return blueprint.RuleParams{
Command: commandStr, Command: commandStr,
CommandDeps: []string{"$sAbiDiffer"}, CommandDeps: []string{"$sAbiDiffer"},
@ -740,7 +742,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, " "),
}, },