diff options
| author | 2025-03-20 05:05:02 -0700 | |
|---|---|---|
| committer | 2025-03-20 05:05:02 -0700 | |
| commit | d1b7198f5112d5ef88aa541d26af4a69d7a9f3d7 (patch) | |
| tree | cc37980b774efea422ec858e2d030fb3228127ff /java | |
| parent | a68dfd0bbc975d903f4d29e361c5bb01d936a1ad (diff) | |
| parent | a03d23cae72fff2a23a35c388004dd55ec8fd7d6 (diff) | |
Merge "Handle android_app_set in Soong built apkcerts.txt" into main am: a03d23cae7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3552799
Change-Id: I88e9b7b47fb52834abce76828538ed32ed0618e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 1 | ||||
| -rw-r--r-- | java/app_set.go | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go index 5c0a9a6ba..05b4a9664 100644 --- a/java/app.go +++ b/java/app.go @@ -82,6 +82,7 @@ type AppInfo struct { Certificate Certificate PrivAppAllowlist android.OptionalPath OverriddenManifestPackageName *string + ApkCertsFile android.Path } var AppInfoProvider = blueprint.NewProvider[*AppInfo]() diff --git a/java/app_set.go b/java/app_set.go index 2e9d31410..6a2c678a8 100644 --- a/java/app_set.go +++ b/java/app_set.go @@ -193,9 +193,10 @@ 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, }) } |