diff options
| author | 2025-02-11 13:59:42 -0800 | |
|---|---|---|
| committer | 2025-02-11 13:59:42 -0800 | |
| commit | 863578e5ed81c44cb8d3d43d0fb9792993a2fc23 (patch) | |
| tree | 4c8bf8ad295e5d2d0574239d075ca3639d256be2 | |
| parent | 0950d776d8604954e740352d217f3519c8d453c5 (diff) | |
| parent | 4b92926bd8c3171d0e0c9a15bf7e15cb2c03c0f8 (diff) | |
Merge "Clarify that an AndroidTest.xml file needs to be deleted for autogen warning to be meaningful" into main am: 4b92926bd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3489330
Change-Id: I471f8a17af2e4ff2e564a511018a88470d43ca37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tradefed/autogen.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tradefed/autogen.go b/tradefed/autogen.go index 4ea8a0bd0..89c69bd23 100644 --- a/tradefed/autogen.go +++ b/tradefed/autogen.go @@ -197,10 +197,10 @@ func AutoGenTestConfig(ctx android.ModuleContext, options AutoGenTestConfigOptio return autogenPath } if len(options.OptionsForAutogenerated) > 0 { - ctx.ModuleErrorf("Extra tradefed configurations (%v) were provided for an autogenerated xml file, but the autogenerated xml file was not used.", options.OptionsForAutogenerated) + ctx.ModuleErrorf("You likely need to delete your soong modules local AndroidTest.xml file. Extra tradefed configurations (%v) were provided for an autogenerated xml file, but the autogenerated xml file was not used.", options.OptionsForAutogenerated) } if len(options.TestRunnerOptions) > 0 { - ctx.ModuleErrorf("Extra test runner options (%v) were provided for an autogenerated xml file, but the autogenerated xml file was not used.", options.TestRunnerOptions) + ctx.ModuleErrorf("You likely need to delete your soong modules local AndroidTest.xml file. Extra test runner options (%v) were provided for an autogenerated xml file, but the autogenerated xml file was not used.", options.TestRunnerOptions) } return path } |