Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 14 insertions, 18 deletions

diff --git a/python/test.go b/python/test.go
index df62ab794..d6670c3c4 100644
--- a/python/test.go
+++ b/python/test.go
@@ -215,25 +215,21 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext
 	installedData := ctx.InstallTestData(installDir, p.data)
 	p.installedDest = ctx.InstallFile(installDir, p.installSource.Base(), p.installSource, installedData...)
 
-	// TODO: Remove the special case for kati
-	if !ctx.Config().KatiEnabled() {
-		// Install the test config in testcases/ directory for atest.
-		// Install configs in the root of $PRODUCT_OUT/testcases/$module
-		testCases := android.PathForModuleInPartitionInstall(ctx, "testcases", ctx.ModuleName())
-		if ctx.PrimaryArch() {
-			if p.testConfig != nil {
-				ctx.InstallFile(testCases, ctx.ModuleName()+".config", p.testConfig)
-			}
-			dynamicConfig := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "DynamicConfig.xml")
-			if dynamicConfig.Valid() {
-				ctx.InstallFile(testCases, ctx.ModuleName()+".dynamic", dynamicConfig.Path())
-			}
-		}
-		// Install tests and data in arch specific subdir $PRODUCT_OUT/testcases/$module/$arch
-		testCases = testCases.Join(ctx, ctx.Target().Arch.ArchType.String())
-		installedData := ctx.InstallTestData(testCases, p.data)
-		ctx.InstallFile(testCases, p.installSource.Base(), p.installSource, installedData...)
+	configFileSuffix := ""
+	// ATS 2.0 is the test harness for mobly tests and the test config is for ATS 2.0.
+	// Add "v2" suffix to test config name to distinguish it from the config for TF.
+	if proptools.String(p.testProperties.Test_options.Runner) == "mobly" {
+		configFileSuffix = "v2"
 	}
+	ctx.SetTestSuiteInfo(android.TestSuiteInfo{
+		TestSuites:       p.binaryProperties.Test_suites,
+		MainFile:         p.installSource,
+		MainFileStem:     p.installSource.Base(),
+		ConfigFile:       p.testConfig,
+		ConfigFileSuffix: configFileSuffix,
+		Data:             p.data,
+		NeedsArchFolder:  true,
+	})
 
 	moduleInfoJSON := ctx.ModuleInfoJSON()
 	moduleInfoJSON.Class = []string{"NATIVE_TESTS"}