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

Merge changes I1270e8d0,I61731a5e

Browse Source 
* changes:
  Move function PathForVndkRefAbiDump to Prevent unnecessary exports in paths.go
  Change the type of parameter prevVersion to int in sourceAbiDump
This commit is contained in:
Treehugger Robot
2022-09-01 06:37:20 +00:00
committed by Gerrit Code Review
parent 7b181b332e f5ed30b2aa
commit bf9c26c364
3 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/builder.go
View File

@@ -920,14 +920,14 @@ func unzipRefDump(ctx android.ModuleContext, zippedRefDump android.Path, baseNam
// sourceAbiDiff registers a build statement to compare linked sAbi dump files (.lsdump).
func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceDump android.Path,
baseName, prevVersion, exportedHeaderFlags string, diffFlags []string,
baseName, exportedHeaderFlags string, diffFlags []string, prevVersion int,
checkAllApis, isLlndk, isNdk, isVndkExt, previousVersionDiff bool) android.OptionalPath {
var outputFile android.ModuleOutPath
if prevVersion == "" {
outputFile = android.PathForModuleOut(ctx, baseName+".abidiff")
if previousVersionDiff {
outputFile = android.PathForModuleOut(ctx, baseName+"."+strconv.Itoa(prevVersion)+".abidiff")
} else {
outputFile = android.PathForModuleOut(ctx, baseName+"."+prevVersion+".abidiff")
outputFile = android.PathForModuleOut(ctx, baseName+".abidiff")
}
libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
@@ -946,12 +946,9 @@ func sourceAbiDiff(ctx android.ModuleContext, inputDump android.Path, referenceD
if previousVersionDiff {
// TODO(b/241496591): Remove -advice-only after b/239792343 and b/239790286 are reolved.
extraFlags = append(extraFlags, "-advice-only")
errorMessage = "error: Please follow development/vndk/tools/header-checker/README.md to ensure the ABI compatibility between your source code and version " + prevVersion + "."
// The prevVersion is expected as a string of int, skip it if not.
if prevVersionInt, err := strconv.Atoi(prevVersion); err == nil {
sourceVersion := strconv.Itoa(prevVersionInt + 1)
extraFlags = append(extraFlags, "-target-version", sourceVersion)
}
errorMessage = "error: Please follow development/vndk/tools/header-checker/README.md to ensure the ABI compatibility between your source code and version " + strconv.Itoa(prevVersion) + "."
sourceVersion := prevVersion + 1
extraFlags = append(extraFlags, "-target-version", strconv.Itoa(sourceVersion))
} else {
errorMessage = "error: Please update ABI references with: $$ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l " + libName
extraFlags = append(extraFlags, "-target-version", "current")