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, 2 deletions

diff --git a/android/fixture_test.go b/android/fixture_test.go
index 5b810e0b7..f11ad3923 100644
--- a/android/fixture_test.go
+++ b/android/fixture_test.go
@@ -24,8 +24,11 @@ func TestFixtureDedup(t *testing.T) {
 	list := []string{}
 
 	appendToList := func(s string) FixturePreparer {
-		return FixtureModifyConfig(func(_ Config) {
-			list = append(list, s)
+		return FixtureModifyConfig(func(config Config) {
+			// Skip generic config to avoid duplicated calls
+			if !config.isGeneric {
+				list = append(list, s)
+			}
 		})
 	}