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

diff --git a/rust/fuzz.go b/rust/fuzz.go
index 9e8efd754..54ee00cdb 100644
--- a/rust/fuzz.go
+++ b/rust/fuzz.go
@@ -30,9 +30,8 @@ func init() {
 type fuzzDecorator struct {
 	*binaryDecorator
 
-	fuzzPackagedModule  fuzz.FuzzPackagedModule
-	sharedLibraries     android.RuleBuilderInstalls
-	installedSharedDeps []string
+	fuzzPackagedModule fuzz.FuzzPackagedModule
+	sharedLibraries    cc.InstallPairs
 }
 
 var _ compiler = (*fuzzDecorator)(nil)
@@ -132,23 +131,14 @@ func (fuzzer *fuzzDecorator) autoDep(ctx android.BottomUpMutatorContext) autoDep
 func (fuzz *fuzzDecorator) install(ctx ModuleContext) {
 	fuzz.fuzzPackagedModule = cc.PackageFuzzModule(ctx, fuzz.fuzzPackagedModule)
 
-	installBase := "fuzz"
-
 	// Grab the list of required shared libraries.
 	fuzz.sharedLibraries, _ = cc.CollectAllSharedDependencies(ctx)
 
-	for _, ruleBuilderInstall := range fuzz.sharedLibraries {
-		install := ruleBuilderInstall.To
-
-		fuzz.installedSharedDeps = append(fuzz.installedSharedDeps,
-			cc.SharedLibraryInstallLocation(
-				install, ctx.Host(), ctx.InstallInVendor(), installBase, ctx.Arch().ArchType.String()))
-
-		// Also add the dependency on the shared library symbols dir.
-		if !ctx.Host() {
-			fuzz.installedSharedDeps = append(fuzz.installedSharedDeps,
-				cc.SharedLibrarySymbolsInstallLocation(install, ctx.InstallInVendor(), installBase, ctx.Arch().ArchType.String()))
-		}
+	for _, sharedLib := range fuzz.sharedLibraries {
+		fuzz.binaryDecorator.installDeps = append(
+			fuzz.binaryDecorator.installDeps,
+			sharedLib.Dst,
+		)
 	}
 
 	var fuzzData []android.DataPath