diff options
Diffstat (limited to 'java/app_set.go')
| -rw-r--r-- | java/app_set.go | 14 |
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, }) } |