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

Merge "Copy abidiffs into /abidiffs on abi breakages."

Browse Source 
am: 3e6584556d

Change-Id: I755837f010548dc8b9dec4350058aac7768a17e4
This commit is contained in:
Jayant Chowdhary
2017-11-28 22:47:02 +00:00
committed by android-build-merger
parent 292325153d 3e6584556d
commit eb11ca9596
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/variable.go
View File

@@ -189,6 +189,7 @@ type productVariables struct {
Override_rs_driver *string `json:",omitempty"` Override_rs_driver *string `json:",omitempty"`
DeviceKernelHeaders []string `json:",omitempty"` DeviceKernelHeaders []string `json:",omitempty"`
DistDir *string `json:",omitempty"`
} }
func boolPtr(v bool) *bool { func boolPtr(v bool) *bool {

16
cc/builder.go
View File

@@ -196,11 +196,19 @@ var (
_ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff") _ = pctx.SourcePathVariable("sAbiDiffer", "prebuilts/build-tools/${config.HostPrebuiltTag}/bin/header-abi-diff")
// Abidiff check turned on in advice-only mode. Builds will not fail on abi incompatibilties / extensions. sAbiDiff = pctx.AndroidRuleFunc("sAbiDiff",
sAbiDiff = pctx.AndroidStaticRule("sAbiDiff", func(config android.Config) (blueprint.RuleParams, error) {
blueprint.RuleParams{
Command: "$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
if distDir != nil && *distDir != "" {
distAbiDiffDir := *distDir + "/abidiffs/"
commandStr += " || (mkdir -p " + distAbiDiffDir + " && cp ${out} " + distAbiDiffDir + " && exit 1)"
}
return blueprint.RuleParams{
Command: commandStr,
CommandDeps: []string{"$sAbiDiffer"}, CommandDeps: []string{"$sAbiDiffer"},
}, nil
}, },
"allowFlags", "referenceDump", "libName", "arch") "allowFlags", "referenceDump", "libName", "arch")