summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-17 22:00:58 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-17 22:00:58 +0000
commit2cc71454c484a0cab30eb50eb1fc56ecb1cd4c49 (patch)
tree34d543b648e07bcb6bb5de3ec6440ba81b4dc7be
parent130cbf6fc147d3be05bd65ff4cf0fdabaf1e4a91 (diff)
parent3c7be418bb091f99cc3efc5b71b6fa00d10080a8 (diff)
Merge "Set fsverity.libs for soong generated filesystem modules" into main
-rw-r--r--fsgen/filesystem_creator.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 89db16654..e075d08db 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -395,6 +395,7 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti
"framework/*/*", // framework/{arch}
"framework/oat/*/*", // framework/oat/{arch}
}
+ fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"}
// system_image properties that are not set:
// - filesystemProperties.Avb_hash_algorithm
@@ -406,7 +407,6 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti
// - filesystemProperties.Mount_point
// - filesystemProperties.Include_make_built_files
// - filesystemProperties.Build_logtags
- // - filesystemProperties.Fsverity.Libs
// - systemImageProperties.Linker_config_src
var module android.Module
if partitionType == "system" {