diff options
| author | 2023-09-27 16:38:57 +0000 | |
|---|---|---|
| committer | 2023-09-27 16:38:57 +0000 | |
| commit | 31bbfe911baa53f4dafe5a89e89417bb60f9fdad (patch) | |
| tree | 68618d6bae5ec22238d2f8ea4ecb761093d14884 | |
| parent | ec59517f6ac8bd8a6553292da6ff697d77aa2322 (diff) | |
| parent | 9c8c5ab3c39e255aaf318ae85215ae05d0ac9c23 (diff) | |
Merge "NDK library: fix ABI monitoring error message" into main
| -rw-r--r-- | cc/ndk_library.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cc/ndk_library.go b/cc/ndk_library.go index b3bb2da15..56c57b94c 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -386,9 +386,11 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) { // level. abiDiffPath := android.PathForModuleOut(ctx, "stgdiff.timestamp") prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel) + missingPrebuiltErrorTemplate := + "Did not find prebuilt ABI dump for %q (%q). Generate with " + + "//development/tools/ndk/update_ndk_abi.sh." missingPrebuiltError := fmt.Sprintf( - "Did not find prebuilt ABI dump for %q (%q). Generate with "+ - "//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx), + missingPrebuiltErrorTemplate, this.libraryName(ctx), prebuiltAbiDump.InvalidReason()) if !prebuiltAbiDump.Valid() { ctx.Build(pctx, android.BuildParams{ @@ -424,12 +426,15 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) { nextAbiDiffPath := android.PathForModuleOut(ctx, "abidiff_next.timestamp") nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel) + missingNextPrebuiltError := fmt.Sprintf( + missingPrebuiltErrorTemplate, this.libraryName(ctx), + nextAbiDump.InvalidReason()) if !nextAbiDump.Valid() { ctx.Build(pctx, android.BuildParams{ Rule: android.ErrorRule, Output: nextAbiDiffPath, Args: map[string]string{ - "error": missingPrebuiltError, + "error": missingNextPrebuiltError, }, }) } else { |