diff options
| author | 2025-03-19 20:52:27 +0000 | |
|---|---|---|
| committer | 2025-03-19 20:53:34 +0000 | |
| commit | 99e7dc152aa61b2013d7a9088c60deecff4da295 (patch) | |
| tree | 8e32b2215bd15aec21043bac50c2bef93b681c14 /java | |
| parent | 21643c6a89a2ece5cd9a16535a46e10162f585ba (diff) | |
Handle android_app_set in Soong built apkcerts.txt
android_app_set modules contain presigned apks, and uses `extract_apks`
to create an entry for each split apk in `LOCAL_APK_CERTS`, which then
gets concatenated to apkcerts.txt when built using Make.
This logic was previously not handled correctly in the new Soong
implementation, causing build errors in partner workspaces.
Bug: 396131789
Test: In partner-workspace, built the soong generated apkcerts.txt file
Change-Id: I7dd0dcd6c992660d5a7e7d484b5d83dc06e051f3
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 560129b64..8d4c3bb3e 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, }) } |