diff options
| author | Colin Cross <ccross@android.com> | 2018-08-07 16:49:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-14 15:44:08 -0700 |
| commit | 303e21f695a7f162727aad8e6229a44dfaed9dfe (patch) | |
| tree | f2b87fc81c418c3f88291451a216acb1ca93a11a /java/java.go | |
| parent | bd1cef56181f3d5a7f60144fe770b11fed6114ed (diff) | |
Move autogenerated test config into Soong
Move autogenerating the test config for Soong modules into Soong
for java_test and android_test modules.
Bug: 70770641
Test: m checkbuild
Test: atest CtsUiRenderingTestCases
Change-Id: I02593add0407ef694b91c14cf27411a4f3cc4745
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index c912368dc..8fe4f3565 100644 --- a/java/java.go +++ b/java/java.go @@ -29,6 +29,7 @@ import ( "android/soong/android" "android/soong/java/config" + "android/soong/tradefed" ) func init() { @@ -1362,6 +1363,14 @@ type Test struct { Library testProperties testProperties + + testConfig android.Path +} + +func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { + j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config) + + j.Library.GenerateAndroidBuildActions(ctx) } func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -1369,6 +1378,7 @@ func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) { if BoolDefault(j.testProperties.Junit, true) { ctx.AddDependency(ctx.Module(), staticLibTag, "junit") } + android.ExtractSourceDeps(ctx, j.testProperties.Test_config) } func TestFactory() android.Module { |