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, 5 insertions, 4 deletions

diff --git a/android/namespace_test.go b/android/namespace_test.go
index a183bbf0d..0026aa78c 100644
--- a/android/namespace_test.go
+++ b/android/namespace_test.go
@@ -664,7 +664,7 @@ func dirBpToPreparer(bps map[string]string) FixturePreparer {
 
 func dependsOn(result *TestResult, module TestingModule, possibleDependency TestingModule) bool {
 	depends := false
-	visit := func(dependency blueprint.Module) {
+	visit := func(dependency Module) {
 		if dependency == possibleDependency.module {
 			depends = true
 		}
@@ -675,7 +675,7 @@ func dependsOn(result *TestResult, module TestingModule, possibleDependency Test
 
 func numDeps(result *TestResult, module TestingModule) int {
 	count := 0
-	visit := func(dependency blueprint.Module) {
+	visit := func(dependency Module) {
 		count++
 	}
 	result.VisitDirectDeps(module.module, visit)
@@ -687,11 +687,11 @@ func getModule(result *TestResult, moduleName string) TestingModule {
 }
 
 func findModuleById(result *TestResult, id string) (module TestingModule) {
-	visit := func(candidate blueprint.Module) {
+	visit := func(candidate Module) {
 		testModule, ok := candidate.(*testModule)
 		if ok {
 			if testModule.properties.Id == id {
-				module = newTestingModule(result.fixture.t, result.config, testModule)
+				module = newTestingModule(result.fixture.t, result.config, testModule, result.ModuleToProxy(testModule))
 			}
 		}
 	}
@@ -734,6 +734,7 @@ func newTestModule() Module {
 
 type blueprintTestModule struct {
 	blueprint.SimpleName
+	blueprint.ModuleBase
 	properties struct {
 		Deps []string
 	}