diff options
| author | 2025-02-18 15:45:11 -0800 | |
|---|---|---|
| committer | 2025-02-18 15:45:11 -0800 | |
| commit | 7fe9ffabfc27d603cd69bd57083c4b8303afb1ee (patch) | |
| tree | a71722517e5ab7982916ab220da9c89e80e4977d /java/java.go | |
| parent | 4ab5e45cacf190553ed5afd075e71ff3679000f5 (diff) | |
| parent | 2f5d627669b9ef61f9cfaaa474a117b739e64d74 (diff) | |
Merge "Install tradefed dynamic config file in soong-only builds" into main am: 2f5d627669
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3495708
Change-Id: Iac990037512a85d5ab9a4d7468d8a5532ab55bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index c5dee0c97..af2b86e2a 100644 --- a/java/java.go +++ b/java/java.go @@ -1910,6 +1910,10 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, if j.testConfig != nil { ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".config", j.testConfig) } + dynamicConfig := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "DynamicConfig.xml") + if dynamicConfig.Valid() { + ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".dynamic", dynamicConfig.Path()) + } testDeps := append(j.data, j.extraTestConfigs...) for _, data := range android.SortedUniquePaths(testDeps) { dataPath := android.DataPath{SrcPath: data} |