Merge "Remove unneeded logic from sourceAbiDiff"
diff --git a/cc/builder.go b/cc/builder.go
index 72f7d12..70bbd6a 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -925,7 +925,6 @@
outputFile := android.PathForModuleOut(ctx, baseName+".abidiff")
libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
- createReferenceDumpFlags := ""
var extraFlags []string
if checkAllApis {
@@ -936,18 +935,8 @@
"-allow-unreferenced-elf-symbol-changes")
}
- if exportedHeaderFlags == "" {
- extraFlags = append(extraFlags, "-advice-only")
- }
-
if isLlndk || isNdk {
- createReferenceDumpFlags = "--llndk"
- if isLlndk {
- // TODO(b/130324828): "-consider-opaque-types-different" should apply to
- // both LLNDK and NDK shared libs. However, a known issue in header-abi-diff
- // breaks libaaudio. Remove the if-guard after the issue is fixed.
- extraFlags = append(extraFlags, "-consider-opaque-types-different")
- }
+ extraFlags = append(extraFlags, "-consider-opaque-types-different")
}
if isVndkExt {
extraFlags = append(extraFlags, "-allow-extensions")
@@ -966,7 +955,7 @@
"libName": libName,
"arch": ctx.Arch().ArchType.Name,
"extraFlags": strings.Join(extraFlags, " "),
- "createReferenceDumpFlags": createReferenceDumpFlags,
+ "createReferenceDumpFlags": "",
},
})
return android.OptionalPathForPath(outputFile)