Merge "Don't install both variants for host or non-make builds."
diff --git a/cc/builder.go b/cc/builder.go
index 6882e9a..a81dc89 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -37,6 +37,14 @@
)
var (
+ abiCheckAllowFlags = []string{
+ "-allow-extensions",
+ "-allow-unreferenced-changes",
+ "-allow-unreferenced-elf-symbol-changes",
+ }
+)
+
+var (
pctx = android.NewPackageContext("android/soong/cc")
cc = pctx.AndroidGomaStaticRule("cc",
@@ -191,10 +199,10 @@
// Abidiff check turned on in advice-only mode. Builds will not fail on abi incompatibilties / extensions.
sAbiDiff = pctx.AndroidStaticRule("sAbiDiff",
blueprint.RuleParams{
- Command: "$sAbiDiffer -lib $libName -arch $arch -advice-only -check-all-apis -o ${out} -new $in -old $referenceDump",
+ Command: "$sAbiDiffer $allowFlags -lib $libName -arch $arch -check-all-apis -o ${out} -new $in -old $referenceDump",
CommandDeps: []string{"$sAbiDiffer"},
},
- "referenceDump", "libName", "arch")
+ "allowFlags", "referenceDump", "libName", "arch")
unzipRefSAbiDump = pctx.AndroidStaticRule("unzipRefSAbiDump",
blueprint.RuleParams{
@@ -709,6 +717,7 @@
"referenceDump": referenceDump.String(),
"libName": baseName,
"arch": ctx.Arch().ArchType.Name,
+ "allowFlags": strings.Join(abiCheckAllowFlags, " "),
},
})
return android.OptionalPathForPath(outputFile)