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

Merge "Improve error output for missing ABI dumps."

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-30 19:18:48 +00:00
committed by Gerrit Code Review
parent b4bac94eb5 f7cb563a18
commit 82c41a8a19
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/ndk_library.go
View File

@@ -396,14 +396,14 @@ func findNextApiLevel(ctx ModuleContext, apiLevel android.ApiLevel) *android.Api
} }
func (this *stubDecorator) diffAbi(ctx ModuleContext) { func (this *stubDecorator) diffAbi(ctx ModuleContext) {
missingPrebuiltError := fmt.Sprintf(
"Did not find prebuilt ABI dump for %q. Generate with "+
"//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx))
// Catch any ABI changes compared to the checked-in definition of this API // Catch any ABI changes compared to the checked-in definition of this API
// level. // level.
abiDiffPath := android.PathForModuleOut(ctx, "abidiff.timestamp") abiDiffPath := android.PathForModuleOut(ctx, "abidiff.timestamp")
prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel) prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel)
missingPrebuiltError := fmt.Sprintf(
"Did not find prebuilt ABI dump for %q (%q). Generate with "+
"//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx),
prebuiltAbiDump.InvalidReason())
if !prebuiltAbiDump.Valid() { if !prebuiltAbiDump.Valid() {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.ErrorRule, Rule: android.ErrorRule,