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

diff --git a/android/cipd/cipd_test.go b/android/cipd/cipd_test.go
new file mode 100644
index 000000000..1d6dee6cc
--- /dev/null
+++ b/android/cipd/cipd_test.go
@@ -0,0 +1,101 @@
+// Copyright 2025 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cipd
+
+import (
+	"android/soong/android"
+	"slices"
+	"testing"
+)
+
+func TestCipdPackage(t *testing.T) {
+	bp := `
+	cipd_package {
+		name: "cipd_package1",
+		package: "android/prebuilts/package1",
+		version: "version1",
+		files: [
+			"package1_file1",
+			"package1_file2",
+		],
+		resolved_versions_file: "cipd.versions",
+	}
+	`
+
+	result := android.GroupFixturePreparers(
+		android.PrepareForTestWithAndroidBuildComponents,
+		android.FixtureRegisterWithContext(RegisterCipdComponents),
+	).RunTestWithBp(t, bp)
+
+	module := result.ModuleForTests(t, "cipd_package1", "")
+	export := module.Rule("cipd_export")
+
+	intermediateDir := "out/soong/.intermediates/cipd_package1"
+	wantEnsureFile := intermediateDir + "/ensure.txt"
+	if export.Input.String() != wantEnsureFile {
+		t.Errorf("export.Input.String() = %v, want %v", export.Input.String(), wantEnsureFile)
+	}
+	if len(export.Inputs) != 0 {
+		t.Errorf("len(export.Inputs) = %v, want 0", len(export.Inputs))
+	}
+
+	wantRoot := intermediateDir + "/package"
+	wantExportOutputs := []string{
+		wantRoot + "/package1_file1",
+		wantRoot + "/package1_file2",
+	}
+
+	var gotExportOutputs []string
+	for _, output := range export.Outputs {
+		gotExportOutputs = append(gotExportOutputs, output.String())
+	}
+	if !slices.Equal(wantExportOutputs, gotExportOutputs) {
+		t.Errorf("export.Outputs = %v, want %v", gotExportOutputs, wantExportOutputs)
+	}
+	if export.Output != nil {
+		t.Errorf("export.Output = %v, want nil", export.Output)
+	}
+	if export.Args["root"] != wantRoot {
+		t.Errorf("export.Args{\"root\"] = %v, want %v", export.Args["root"], wantRoot)
+	}
+	if len(export.Args) != 1 {
+		t.Errorf("len(export.Args) = %v, want 1", len(export.Args))
+	}
+
+	zipRule := module.Rule("soong_zip_from_dir")
+	wantZipFile := intermediateDir + "/package.zip"
+	if zipRule.Output.String() != wantZipFile {
+		t.Errorf("zipRule.Output = %q, want %q", zipRule.Output.String(), wantZipFile)
+	}
+
+	if zipRule.Input.String() != wantEnsureFile {
+		t.Errorf("zipRule.Input.String() = %q, want %q", zipRule.Input.String(), wantEnsureFile)
+	}
+	if len(zipRule.Args) != 1 {
+		t.Fatalf("len(zipRule.Args) = %v, want 1 (was %v)", len(zipRule.Args), zipRule.Args)
+	}
+	wantTempZipDir := intermediateDir + "/zip_temp_pkg_dir"
+	if zipRule.Args["tempZipDir"] != wantTempZipDir {
+		t.Errorf("zipRule.Args[\"tempZipDir\"] = %q, want %q", zipRule.Args["tempZipDir"], wantTempZipDir)
+	}
+
+	zipTaggedOutputs := module.OutputFiles(result.TestContext, t, "zip")
+	if len(zipTaggedOutputs) != 1 {
+		t.Errorf("len(module.OutputFiles(..., \"zip\")) = %d, want 1", len(zipTaggedOutputs))
+	}
+	if val := zipTaggedOutputs[0].String(); val != wantZipFile {
+		t.Errorf("module.OutputFiles(..., \"zip\")[0] = %q, want %q", val, wantZipFile)
+	}
+}