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

diff --git a/rust/config/arm_linux_host.go b/rust/config/arm_linux_host.go
index 22bdaee3e..6e7593204 100644
--- a/rust/config/arm_linux_host.go
+++ b/rust/config/arm_linux_host.go
@@ -56,7 +56,7 @@ func (t *toolchainLinuxArm64) Name() string {
 
 func (t *toolchainLinuxArm64) ToolchainLinkFlags() string {
 	// Prepend the lld flags from cc_config so we stay in sync with cc
-	return "${cc_config.LinuxLldflags} ${cc_config.LinuxArm64Lldflags} " +
+	return "${cc_config.LinuxLdflags} ${cc_config.LinuxArm64Ldflags} " +
 		"${config.LinuxToolchainLinkFlags} ${config.LinuxToolchainArm64LinkFlags}"
 }
 
@@ -113,7 +113,7 @@ func (toolchainLinuxArm64) LibclangRuntimeLibraryArch() string {
 
 func (t *toolchainLinuxArm) ToolchainLinkFlags() string {
 	// Prepend the lld flags from cc_config so we stay in sync with cc
-	return "${cc_config.LinuxLldflags} ${cc_config.LinuxArmLldflags} " +
+	return "${cc_config.LinuxLdflags} ${cc_config.LinuxArmLdflags} " +
 		"${config.LinuxToolchainLinkFlags} ${config.LinuxToolchainArmLinkFlags}"
 }