From 38afe711d13e01ca1d5db96dd018a1044ee4f3aa Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 5 Mar 2025 23:27:55 +0000 Subject: Create apkcerts.txt using Soong This CL creates an apkcerts.txt of the apps installed on the device, and any apk-in-apex of installed apexes. Note that this behavior is unlike make. There is some ongoing discussion on whether the make behavior can be updated to only list the installed apps as well. To implement this, androidDevice will consult the following providers from the list of installed modules - AppInfoProvider (android_app, android_app_import, ...) - AppInfosProvider (for apk-in-apex) - RuntimeResourceOverlayInfoProvider (for checked-in and autogen rros) Test: With https://r.android.com/3529333, apkcerts.txt is identical for aosp_cf_x86_64_phone between make and soong Bug: 399788149 Change-Id: I10009ea8761a197dd2301acf9615079bd28af3f5 --- filesystem/filesystem.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 35fdd00a3..8b3b51e89 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -438,6 +438,8 @@ type FilesystemInfo struct { Owners []InstalledModuleInfo UseAvb bool + + HasFsverity bool } // FullInstallPathInfo contains information about the "full install" paths of all the files @@ -683,6 +685,7 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { FilesystemConfig: f.generateFilesystemConfig(ctx, rootDir, rebasedDir), Owners: f.gatherOwners(specs), UseAvb: proptools.Bool(f.properties.Use_avb), + HasFsverity: f.properties.Fsverity.Inputs.GetOrDefault(ctx, nil) != nil, } android.SetProvider(ctx, FilesystemProvider, fsInfo) -- cgit v1.2.3-59-g8ed1b