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

Merge "Disable header ABI checker for NDK" into main

Browse Source
This commit is contained in:
Hsin-Yi Chen
2024-05-07 02:28:04 +00:00
committed by Gerrit Code Review
parent 197b56f58b 6fd2895273
commit a27230aaf6
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cc/library.go
View File

@@ -1322,7 +1322,7 @@ func currRefAbiDumpSdkVersion(ctx ModuleContext) string {
// sourceAbiDiff registers a build statement to compare linked sAbi dump files (.lsdump). // sourceAbiDiff registers a build statement to compare linked sAbi dump files (.lsdump).
func (library *libraryDecorator) sourceAbiDiff(ctx android.ModuleContext, func (library *libraryDecorator) sourceAbiDiff(ctx android.ModuleContext,
sourceDump, referenceDump android.Path, sourceDump, referenceDump android.Path,
baseName, nameExt string, isLlndkOrNdk, allowExtensions bool, baseName, nameExt string, isLlndk, allowExtensions bool,
sourceVersion, errorMessage string) { sourceVersion, errorMessage string) {
extraFlags := []string{"-target-version", sourceVersion} extraFlags := []string{"-target-version", sourceVersion}
@@ -1334,7 +1334,7 @@ func (library *libraryDecorator) sourceAbiDiff(ctx android.ModuleContext,
"-allow-unreferenced-changes", "-allow-unreferenced-changes",
"-allow-unreferenced-elf-symbol-changes") "-allow-unreferenced-elf-symbol-changes")
} }
if isLlndkOrNdk { if isLlndk {
extraFlags = append(extraFlags, "-consider-opaque-types-different") extraFlags = append(extraFlags, "-consider-opaque-types-different")
} }
if allowExtensions { if allowExtensions {
@@ -1350,23 +1350,23 @@ func (library *libraryDecorator) sourceAbiDiff(ctx android.ModuleContext,
func (library *libraryDecorator) crossVersionAbiDiff(ctx android.ModuleContext, func (library *libraryDecorator) crossVersionAbiDiff(ctx android.ModuleContext,
sourceDump, referenceDump android.Path, sourceDump, referenceDump android.Path,
baseName string, isLlndkOrNdk bool, sourceVersion, prevVersion string) { baseName string, isLlndk bool, sourceVersion, prevVersion string) {
errorMessage := "error: Please follow https://android.googlesource.com/platform/development/+/main/vndk/tools/header-checker/README.md#configure-cross_version-abi-check to resolve the ABI difference between your source code and version " + prevVersion + "." errorMessage := "error: Please follow https://android.googlesource.com/platform/development/+/main/vndk/tools/header-checker/README.md#configure-cross_version-abi-check to resolve the ABI difference between your source code and version " + prevVersion + "."
library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, prevVersion, library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, prevVersion,
isLlndkOrNdk, true /* allowExtensions */, sourceVersion, errorMessage) isLlndk, true /* allowExtensions */, sourceVersion, errorMessage)
} }
func (library *libraryDecorator) sameVersionAbiDiff(ctx android.ModuleContext, func (library *libraryDecorator) sameVersionAbiDiff(ctx android.ModuleContext,
sourceDump, referenceDump android.Path, sourceDump, referenceDump android.Path,
baseName, nameExt string, isLlndkOrNdk bool) { baseName, nameExt string, isLlndk bool) {
libName := strings.TrimSuffix(baseName, filepath.Ext(baseName)) libName := strings.TrimSuffix(baseName, filepath.Ext(baseName))
errorMessage := "error: Please update ABI references with: $$ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l " + libName errorMessage := "error: Please update ABI references with: $$ANDROID_BUILD_TOP/development/vndk/tools/header-checker/utils/create_reference_dumps.py -l " + libName
library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, nameExt, library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, nameExt,
isLlndkOrNdk, false /* allowExtensions */, "current", errorMessage) isLlndk, false /* allowExtensions */, "current", errorMessage)
} }
func (library *libraryDecorator) optInAbiDiff(ctx android.ModuleContext, func (library *libraryDecorator) optInAbiDiff(ctx android.ModuleContext,
@@ -1381,7 +1381,7 @@ func (library *libraryDecorator) optInAbiDiff(ctx android.ModuleContext,
} }
library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, nameExt, library.sourceAbiDiff(ctx, sourceDump, referenceDump, baseName, nameExt,
false /* isLlndkOrNdk */, false /* allowExtensions */, "current", errorMessage) false /* isLlndk */, false /* allowExtensions */, "current", errorMessage)
} }
func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathDeps, objs Objects, fileName string, soFile android.Path) { func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathDeps, objs Objects, fileName string, soFile android.Path) {
@@ -1436,7 +1436,6 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathD
dumpDir := filepath.Join("prebuilts", "abi-dumps", dumpDirName) dumpDir := filepath.Join("prebuilts", "abi-dumps", dumpDirName)
isLlndk := (tag == llndkLsdumpTag) isLlndk := (tag == llndkLsdumpTag)
isApex := (tag == apexLsdumpTag) isApex := (tag == apexLsdumpTag)
isNdk := (tag == ndkLsdumpTag)
binderBitness := ctx.DeviceConfig().BinderBitness() binderBitness := ctx.DeviceConfig().BinderBitness()
nameExt := "" nameExt := ""
if isLlndk { if isLlndk {
@@ -1468,7 +1467,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathD
prevDumpFile := getRefAbiDumpFile(ctx, prevDumpDir, fileName) prevDumpFile := getRefAbiDumpFile(ctx, prevDumpDir, fileName)
if prevDumpFile.Valid() { if prevDumpFile.Valid() {
library.crossVersionAbiDiff(ctx, sourceDump, prevDumpFile.Path(), library.crossVersionAbiDiff(ctx, sourceDump, prevDumpFile.Path(),
fileName, isLlndk || isNdk, currVersion, nameExt+prevVersion) fileName, isLlndk, currVersion, nameExt+prevVersion)
} }
// Check against the current version. // Check against the current version.
sourceDump = implDump sourceDump = implDump
@@ -1488,7 +1487,7 @@ func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, deps PathD
currDumpFile := getRefAbiDumpFile(ctx, currDumpDir, fileName) currDumpFile := getRefAbiDumpFile(ctx, currDumpDir, fileName)
if currDumpFile.Valid() { if currDumpFile.Valid() {
library.sameVersionAbiDiff(ctx, sourceDump, currDumpFile.Path(), library.sameVersionAbiDiff(ctx, sourceDump, currDumpFile.Path(),
fileName, nameExt, isLlndk || isNdk) fileName, nameExt, isLlndk)
} }
} }
// Check against the opt-in reference dumps. // Check against the opt-in reference dumps.

6
cc/sabi.go
View File

@@ -31,7 +31,6 @@ type lsdumpTag string
const ( const (
apexLsdumpTag lsdumpTag = "APEX" apexLsdumpTag lsdumpTag = "APEX"
llndkLsdumpTag lsdumpTag = "LLNDK" llndkLsdumpTag lsdumpTag = "LLNDK"
ndkLsdumpTag lsdumpTag = "NDK"
platformLsdumpTag lsdumpTag = "PLATFORM" platformLsdumpTag lsdumpTag = "PLATFORM"
productLsdumpTag lsdumpTag = "PRODUCT" productLsdumpTag lsdumpTag = "PRODUCT"
vendorLsdumpTag lsdumpTag = "VENDOR" vendorLsdumpTag lsdumpTag = "VENDOR"
@@ -42,8 +41,6 @@ func (tag *lsdumpTag) dirName() string {
switch *tag { switch *tag {
case apexLsdumpTag: case apexLsdumpTag:
return "platform" return "platform"
case ndkLsdumpTag:
return "ndk"
case llndkLsdumpTag: case llndkLsdumpTag:
return "vndk" return "vndk"
case platformLsdumpTag: case platformLsdumpTag:
@@ -137,9 +134,6 @@ func classifySourceAbiDump(ctx android.BaseModuleContext) []lsdumpTag {
if m.isImplementationForLLNDKPublic() { if m.isImplementationForLLNDKPublic() {
result = append(result, llndkLsdumpTag) result = append(result, llndkLsdumpTag)
} }
if m.IsNdk(ctx.Config()) {
result = append(result, ndkLsdumpTag)
}
// APEX and opt-in platform dumps are placed in the same directory. // APEX and opt-in platform dumps are placed in the same directory.
if m.library.hasStubsVariants() { if m.library.hasStubsVariants() {
result = append(result, apexLsdumpTag) result = append(result, apexLsdumpTag)