diff options
| author | 2025-03-06 15:51:48 -0800 | |
|---|---|---|
| committer | 2025-03-06 15:51:48 -0800 | |
| commit | 236e276404e1111a672a315e5463ed88cf13f691 (patch) | |
| tree | 94ef1e89f0de6200fd483ff9b25eb88d0b500785 /apex/apex.go | |
| parent | 6a0416f424e99eff880bad3919c36756d3142907 (diff) | |
| parent | 87f1f1ee088097fa1ed16304d6ffeee32b58bdd5 (diff) | |
Merge "Create apkcerts.txt using Soong" into main am: 87f1f1ee08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3529491
Change-Id: Ie10cc144bcc90a65b9cb547e58e9fc3aebc96218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 196f389d2..38ab012d8 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -550,6 +550,9 @@ type apexBundle struct { // Required modules, filled out during GenerateAndroidBuildActions and used in AndroidMk required []string + + // appinfo of the apk-in-apex of this module + appInfos java.AppInfos } // apexFileClass represents a type of file that can be included in APEX. @@ -1931,6 +1934,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, } case androidAppTag: if appInfo, ok := android.OtherModuleProvider(ctx, child, java.AppInfoProvider); ok { + a.appInfos = append(a.appInfos, *appInfo) if appInfo.AppSet { appDir := "app" if appInfo.Privileged { @@ -2267,6 +2271,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { }) android.SetProvider(ctx, filesystem.ApexKeyPathInfoProvider, filesystem.ApexKeyPathInfo{a.apexKeysPath}) + + android.SetProvider(ctx, java.AppInfosProvider, a.appInfos) } // Set prebuiltInfoProvider. This will be used by `apex_prebuiltinfo_singleton` to print out a metadata file |