Merge "NDK library: fix ABI monitoring error message" into main

This commit is contained in:
Aleksei Vetrov
2023-09-27 16:38:57 +00:00
committed by Gerrit Code Review

View File

@@ -386,9 +386,11 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
// level. // level.
abiDiffPath := android.PathForModuleOut(ctx, "stgdiff.timestamp") abiDiffPath := android.PathForModuleOut(ctx, "stgdiff.timestamp")
prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel) 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( missingPrebuiltError := fmt.Sprintf(
"Did not find prebuilt ABI dump for %q (%q). Generate with "+ missingPrebuiltErrorTemplate, this.libraryName(ctx),
"//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx),
prebuiltAbiDump.InvalidReason()) prebuiltAbiDump.InvalidReason())
if !prebuiltAbiDump.Valid() { if !prebuiltAbiDump.Valid() {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
@@ -424,12 +426,15 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
nextAbiDiffPath := android.PathForModuleOut(ctx, nextAbiDiffPath := android.PathForModuleOut(ctx,
"abidiff_next.timestamp") "abidiff_next.timestamp")
nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel) nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel)
missingNextPrebuiltError := fmt.Sprintf(
missingPrebuiltErrorTemplate, this.libraryName(ctx),
nextAbiDump.InvalidReason())
if !nextAbiDump.Valid() { if !nextAbiDump.Valid() {
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.ErrorRule, Rule: android.ErrorRule,
Output: nextAbiDiffPath, Output: nextAbiDiffPath,
Args: map[string]string{ Args: map[string]string{
"error": missingPrebuiltError, "error": missingNextPrebuiltError,
}, },
}) })
} else { } else {