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

Merge "Remove unneeded logic from sourceAbiDiff" am: 6e9225d53c am: 76e7546a6b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2114875

Change-Id: I5768c30f4e80a65e0bb998c0700a7210c915e19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hsin-Yi Chen 2022-06-08 03:46:25 +00:00 committed by Automerger Merge Worker
commit 4108552615
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cc/builder.go
View file

@ -923,7 +923,6 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
outputFile := android.PathForModuleOut(ctx, baseName+".abidiff")
libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
createReferenceDumpFlags := ""
var extraFlags []string
if checkAllApis {
@ -934,18 +933,8 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
"-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")
@ -964,7 +953,7 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
"libName": libName,
"arch": ctx.Arch().ArchType.Name,
"extraFlags": strings.Join(extraFlags, " "),
"createReferenceDumpFlags": createReferenceDumpFlags,
"createReferenceDumpFlags": "",
},
})
return android.OptionalPathForPath(outputFile)