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

Merge "NDK library: use prebuilts to check next level ABI" into main

Browse Source
This commit is contained in:
Aleksei Vetrov
2023-09-20 11:16:59 +00:00
committed by Gerrit Code Review
parent c0f7bd1a15 8c02bbc533
commit ed8fb7a6a6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/ndk_library.go
View File

@@ -415,7 +415,7 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
// Also ensure that the ABI of the next API level (if there is one) matches // Also ensure that the ABI of the next API level (if there is one) matches
// this API level. *New* ABI is allowed, but any changes to APIs that exist // this API level. *New* ABI is allowed, but any changes to APIs that exist
// in this API level are disallowed. // in this API level are disallowed.
if !this.apiLevel.IsCurrent() { if !this.apiLevel.IsCurrent() && prebuiltAbiDump.Valid() {
nextApiLevel := findNextApiLevel(ctx, this.apiLevel) nextApiLevel := findNextApiLevel(ctx, this.apiLevel)
if nextApiLevel == nil { if nextApiLevel == nil {
panic(fmt.Errorf("could not determine which API level follows "+ panic(fmt.Errorf("could not determine which API level follows "+
@@ -435,10 +435,12 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
} else { } else {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: stgdiff, Rule: stgdiff,
Description: fmt.Sprintf("abidiff %s %s", this.abiDumpPath, Description: fmt.Sprintf(
nextAbiDump), "Comparing ABI to the next API level %s %s",
prebuiltAbiDump, nextAbiDump),
Output: nextAbiDiffPath, Output: nextAbiDiffPath,
Inputs: android.Paths{this.abiDumpPath, nextAbiDump.Path()}, Inputs: android.Paths{
prebuiltAbiDump.Path(), nextAbiDump.Path()},
Args: map[string]string{ Args: map[string]string{
"args": "--format=small --ignore=interface_addition", "args": "--format=small --ignore=interface_addition",
}, },