From d6ceb8600c062531db02e87f342629bcea837d3a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 4 Mar 2021 23:02:31 +0000 Subject: Clean up cc.RegisterRequiredBuildComponentsForTest() Changes this function so it only registers components from the cc package by pushing the call to genrule.RegisterGenruleBuildComponents() down into those packages whose tests need it. This will make it easier to migrate cc package tests to test fixtures as the RegisterRequiredBuildComponentsForTest() no longer overlaps with preparers from the genrule packages. Bug: 181070625 Test: m nothing Change-Id: Ic00c7e480dc738d7a88d038aca6ab95a1502a24a --- java/java_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index bb51ebc3d..911265532 100644 --- a/java/java_test.go +++ b/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) -- cgit v1.2.3-59-g8ed1b