Merge "Provide reason for unconverted bp2build modules"

2 files changed, 5 insertions, 0 deletions

diff --git a/java/base.go b/java/base.go
index 23c7bb103..f9c9e1e0f 100644
--- a/java/base.go
+++ b/java/base.go
@@ -20,6 +20,7 @@ import (
 	"strconv"
 	"strings"
 
+	"android/soong/ui/metrics/bp2build_metrics_proto"
 	"github.com/google/blueprint/pathtools"
 	"github.com/google/blueprint/proptools"
 
@@ -2213,5 +2214,7 @@ func (j *Module) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
 		if testHost, ok := ctx.Module().(*TestHost); ok {
 			javaTestHostBp2Build(ctx, testHost)
 		}
+	default:
+		ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "")
 	}
 }
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 6491bed0a..3de82388d 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 	"sync"
 
+	"android/soong/ui/metrics/bp2build_metrics_proto"
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/proptools"
 
@@ -2232,6 +2233,7 @@ type bazelSdkLibraryAttributes struct {
 // java_sdk_library bp2build converter
 func (module *SdkLibrary) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
 	if ctx.ModuleType() != "java_sdk_library" {
+		ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_TYPE_UNSUPPORTED, "")
 		return
 	}