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

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

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

Change-Id: I319970325b47c4972d9d8d99188d27877da0fc4b
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 02:41:18 +00:00
committed by Automerger Merge Worker
parent 343ec9dbdf 6e9225d53c
commit 76e7546a6b
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/builder.go
View File

@@ -925,7 +925,6 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
outputFile := android.PathForModuleOut(ctx, baseName+".abidiff") outputFile := android.PathForModuleOut(ctx, baseName+".abidiff")
libName := strings.TrimSuffix(baseName, filepath.Ext(baseName)) libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
createReferenceDumpFlags := ""
var extraFlags []string var extraFlags []string
if checkAllApis { if checkAllApis {
@@ -936,19 +935,9 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
"-allow-unreferenced-elf-symbol-changes") "-allow-unreferenced-elf-symbol-changes")
} }
if exportedHeaderFlags == "" {
extraFlags = append(extraFlags, "-advice-only")
}
if isLlndk || isNdk { 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 { if isVndkExt {
extraFlags = append(extraFlags, "-allow-extensions") extraFlags = append(extraFlags, "-allow-extensions")
} }
@@ -966,7 +955,7 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
"libName": libName, "libName": libName,
"arch": ctx.Arch().ArchType.Name, "arch": ctx.Arch().ArchType.Name,
"extraFlags": strings.Join(extraFlags, " "), "extraFlags": strings.Join(extraFlags, " "),
"createReferenceDumpFlags": createReferenceDumpFlags, "createReferenceDumpFlags": "",
}, },
}) })
return android.OptionalPathForPath(outputFile) return android.OptionalPathForPath(outputFile)