diff options
| author | 2021-03-04 23:02:31 +0000 | |
|---|---|---|
| committer | 2021-03-05 18:20:33 +0000 | |
| commit | d6ceb8600c062531db02e87f342629bcea837d3a (patch) | |
| tree | f8ceaac3ef33592bfc193105b90bc8003fd0c33f /java/java_test.go | |
| parent | a560d5a91dd09292dfa30acd88507880de0d5459 (diff) | |
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
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) |