Merge "Clean up cc.RegisterRequiredBuildComponentsForTest()"

java/java_test.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"testing"
 
+	"android/soong/genrule"
 	"github.com/google/blueprint/proptools"
 
 	"android/soong/android"
@@ -79,6 +80,8 @@ func testContext(config android.Config) *android.TestContext {
 
 	android.RegisterPrebuiltMutators(ctx)
 
+	genrule.RegisterGenruleBuildComponents(ctx)
+
 	// Register module types and mutators from cc needed for JNI testing
 	cc.RegisterRequiredBuildComponentsForTest(ctx)