Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c8c5ab3 authored by Aleksei Vetrov's avatar Aleksei Vetrov
Browse files

NDK library: fix ABI monitoring error message 



Error message in case of not valid "nextAbiDump" included wrong
"prebuiltAbiDump.InvalidReason()". Refactor error message to include
"nextAbiDump.InvalidReason()" instead.

Change-Id: I2581734dd16649af2b282b3459f461658abd3d87
Signed-off-by: default avatarAleksei Vetrov <vvvvvv@google.com>
parent 370e3417

cc/ndk_library.go

+8 −3
Original line number Diff line number Diff line
@@ -386,9 +386,11 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) { 
	// level.

	abiDiffPath := android.PathForModuleOut(ctx, "stgdiff.timestamp")

	prebuiltAbiDump := this.findPrebuiltAbiDump(ctx, this.apiLevel)

	missingPrebuiltError := fmt.Sprintf(

	missingPrebuiltErrorTemplate :=

		"Did not find prebuilt ABI dump for %q (%q). Generate with " +

			"//development/tools/ndk/update_ndk_abi.sh.", this.libraryName(ctx),

			"//development/tools/ndk/update_ndk_abi.sh."

	missingPrebuiltError := fmt.Sprintf(

		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 {