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

diff --git a/apex/key.go b/apex/key.go
index cc66a131f..b43ac1e4a 100644
--- a/apex/key.go
+++ b/apex/key.go
@@ -196,9 +196,9 @@ type allApexCerts struct {
 func (_ *allApexCerts) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	var avbpubkeys android.Paths
 	var certificatesPem android.Paths
-	ctx.VisitDirectDeps(func(m android.Module) {
-		if apex, ok := m.(*apexBundle); ok {
-			pem, _ := apex.getCertificateAndPrivateKey(ctx)
+	ctx.VisitDirectDepsProxy(func(m android.ModuleProxy) {
+		if apex, ok := android.OtherModuleProvider(ctx, m, android.ApexBundleTypeInfoProvider); ok {
+			pem := apex.Pem
 			if !android.ExistentPathForSource(ctx, pem.String()).Valid() {
 				if ctx.Config().AllowMissingDependencies() {
 					return
@@ -208,7 +208,7 @@ func (_ *allApexCerts) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 			}
 			certificatesPem = append(certificatesPem, pem)
 			// avbpubkey for signing the apex payload
-			avbpubkeys = append(avbpubkeys, apex.publicKeyFile)
+			avbpubkeys = append(avbpubkeys, apex.Key)
 		}
 	})
 	certificatesPem = android.SortedUniquePaths(certificatesPem) // For hermiticity