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, 9 insertions, 5 deletions

diff --git a/java/app_set.go b/java/app_set.go
index 6a2c678a8..e7bef6e4f 100644
--- a/java/app_set.go
+++ b/java/app_set.go
@@ -131,7 +131,7 @@ type prebuiltInfoProps struct {
 // Set prebuiltInfoProvider. This will be used by `apex_prebuiltinfo_singleton` to print out a metadata file
 // with information about whether source or prebuilt of an apex was used during the build.
 func providePrebuiltInfo(ctx android.ModuleContext, p prebuiltInfoProps) {
-	info := android.PrebuiltInfo{
+	info := android.PrebuiltJsonInfo{
 		Name:        p.baseModuleName,
 		Is_prebuilt: p.isPrebuilt,
 	}
@@ -140,7 +140,7 @@ func providePrebuiltInfo(ctx android.ModuleContext, p prebuiltInfoProps) {
 		prebuiltInfoFile := android.PathForModuleSrc(ctx, *p.prebuiltInfo)
 		info.Prebuilt_info_file_path = prebuiltInfoFile.String()
 	}
-	android.SetProvider(ctx, android.PrebuiltInfoProvider, info)
+	android.SetProvider(ctx, android.PrebuiltJsonInfoProvider, info)
 }
 
 func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -193,9 +193,13 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext)
 	)
 
 	android.SetProvider(ctx, AppInfoProvider, &AppInfo{
-		AppSet:       true,
-		Privileged:   as.Privileged(),
-		OutputFile:   as.OutputFile(),
+		AppSet:                  true,
+		Privileged:              as.Privileged(),
+		OutputFile:              as.OutputFile(),
+		ApkCertsFile:            as.apkcertsFile,
+		PackedAdditionalOutputs: as.packedOutput,
+	})
+	android.SetProvider(ctx, ApkCertInfoProvider, ApkCertInfo{
 		ApkCertsFile: as.apkcertsFile,
 	})
 }