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

diff --git a/aconfig/build_flags/init.go b/aconfig/build_flags/init.go
index a7575e86a..0b499600a 100644
--- a/aconfig/build_flags/init.go
+++ b/aconfig/build_flags/init.go
@@ -72,19 +72,24 @@ var (
 			CommandDeps: []string{
 				"${releaseConfigContributions}",
 			},
+			Restat: true,
 		}, "dirs", "format")
-	allReleaseConfigContributionsRuleText = pctx.AndroidStaticRule("all-release-config-contributions-dumptext",
+
+	flagDeclarationsValidationRule = pctx.AndroidStaticRule("flagDeclarationsValidation",
 		blueprint.RuleParams{
-			Command: `${releaseConfigContributions} ${dirs} --format ${format} --output ${out}`,
+			// Get no flags, so that we have no output.
+			Command: `${buildFlag} --maps-file ${in} --quiet --declarations-only get && date > ${out}`,
 			CommandDeps: []string{
-				"${releaseConfigContributions}",
+				"${buildFlag}",
 			},
-		}, "dirs", "format")
+			Restat: true,
+		})
 )
 
 func init() {
 	RegisterBuildComponents(android.InitRegistrationContext)
 	pctx.Import("android/soong/android")
+	pctx.HostBinToolVariable("buildFlag", "build-flag-internal")
 	pctx.HostBinToolVariable("buildFlagDeclarations", "build-flag-declarations")
 	pctx.HostBinToolVariable("releaseConfigContributions", "release-config-contributions")
 }
@@ -92,5 +97,6 @@ func init() {
 func RegisterBuildComponents(ctx android.RegistrationContext) {
 	ctx.RegisterModuleType("build_flag_declarations", DeclarationsFactory)
 	ctx.RegisterModuleType("release_config_contributions", ReleaseConfigContributionsFactory)
+	ctx.RegisterModuleType("all_release_configs", AllReleaseConfigsFactory)
 	ctx.RegisterParallelSingletonType("all_build_flag_declarations", AllBuildFlagDeclarationsFactory)
 }