From 99e7dc152aa61b2013d7a9088c60deecff4da295 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 19 Mar 2025 20:52:27 +0000 Subject: 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 --- java/app_set.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/app_set.go') 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, }) } -- cgit v1.2.3-59-g8ed1b