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, 23 insertions, 1 deletions

diff --git a/android/defs.go b/android/defs.go
index 57fcc9b13..4f1e849e4 100644
--- a/android/defs.go
+++ b/android/defs.go
@@ -126,7 +126,27 @@ var (
 			Description: "concatenate files to $out",
 		})
 
-	// Used only when USE_GOMA=true is set, to restrict non-goma jobs to the local parallelism value
+	CatAndSort = pctx.AndroidStaticRule("CatAndSort",
+		blueprint.RuleParams{
+			Command:     "rm -f $out && cat $in > $out && sort -o $out $out",
+			Description: "concatenate sorted file contents to $out",
+		})
+
+	CatAndSortAndUnique = pctx.AndroidStaticRule("CatAndSortAndUnique",
+		blueprint.RuleParams{
+			Command:     "rm -f $out && cat $in > $out && sort -u -o $out $out",
+			Description: "concatenate sorted file contents to $out",
+		})
+
+	MergeZips = pctx.AndroidStaticRule("MergeZips",
+		blueprint.RuleParams{
+			Command: `${MergeZipsCmd} -s $out $in`,
+			CommandDeps: []string{
+				"${MergeZipsCmd}",
+			},
+		})
+
+	// Used only when USE_RBE=true is set, to restrict non-RBE jobs to the local parallelism value
 	localPool = blueprint.NewBuiltinPool("local_pool")
 
 	// Used only by RuleBuilder to identify remoteable rules. Does not actually get created in ninja.
@@ -142,6 +162,8 @@ func init() {
 	pctx.VariableFunc("RBEWrapper", func(ctx PackageVarContext) string {
 		return ctx.Config().RBEWrapper()
 	})
+
+	pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")
 }
 
 // CopyFileRule creates a ninja rule to copy path to outPath.