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, 62 insertions, 0 deletions

diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go
index e57e45cb6..2e7f478ff 100644
--- a/filesystem/filesystem_test.go
+++ b/filesystem/filesystem_test.go
@@ -803,3 +803,65 @@ func TestRamdiskPartitionSetsDevNodes(t *testing.T) {
 		java.CheckModuleHasDependency(t, result.TestContext, "ramdisk_filesystem", "android_common", "ramdisk_node_list"),
 	)
 }
+
+func TestFileSystemWithNativeBridgeDeps(t *testing.T) {
+	result := android.GroupFixturePreparers(
+		fixture,
+		android.PrepareForNativeBridgeEnabled,
+	).RunTestWithBp(t, `
+		android_filesystem {
+			name: "myfilesystem",
+			compile_multilib: "both",
+			native_bridge_supported: true,
+			deps: ["lib_no_native_bridge", "lib_both"],
+			multilib: {
+				native_bridge: {
+					deps: ["lib_both", "lib_only_native_bridge"],
+				},
+			},
+		}
+
+		cc_library {
+			name: "lib_no_native_bridge",
+			stl: "none",
+			system_shared_libs: [],
+		}
+		// Device arch and NativeBridge arch
+		cc_library {
+			name: "lib_both",
+			native_bridge_supported: true,
+			stl: "none",
+			system_shared_libs: [],
+		}
+		cc_library {
+			name: "lib_only_native_bridge",
+			native_bridge_supported: true,
+			enabled: false,
+			target: {
+				native_bridge: {
+					enabled: true,
+				},
+			},
+			stl: "none",
+			system_shared_libs: [],
+		}
+	`)
+
+	// produces "myfilesystem.img"
+	result.ModuleForTests(t, "myfilesystem", "android_common").Output("myfilesystem.img")
+
+	fs := result.ModuleForTests(t, "myfilesystem", "android_common").Module().(*filesystem)
+	expected := []string{
+		// Non NativeBridge
+		"lib64/lib_no_native_bridge.so",
+		"lib64/lib_both.so",
+		// NativeBridge
+		"lib/arm/lib_both.so",
+		"lib/arm/lib_only_native_bridge.so",
+		"lib64/arm64/lib_both.so",
+		"lib64/arm64/lib_only_native_bridge.so",
+	}
+	for _, e := range expected {
+		android.AssertStringListContains(t, "missing entry", fs.entries, e)
+	}
+}