commit 29daa0cc47b6814ff53ddb87e10409bf4f5faced
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 23 22:02:15 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 23 22:02:15 2024 +0000
tree e4c15f52c766555568466e5200682f7fda9c53e3
parent adab47873bc145ef576d93a01b0070c1ca476ae9
parent 49cc3e822af58cd8c1c23041df405f1eefe340db

Merge "Add fs_config_files_vendor and fs_config_dirs_vendor to deps" into main

fsgen/filesystem_creator.go

diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 75d2caa..c903338 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -130,7 +130,10 @@
 					"public.libraries.android.txt": defaultDepCandidateProps(ctx.Config()),
 					"update_engine_sideload":       defaultDepCandidateProps(ctx.Config()),
 				},
-				"vendor":  newMultilibDeps(),
+				"vendor": &map[string]*depCandidateProps{
+					"fs_config_files_vendor": defaultDepCandidateProps(ctx.Config()),
+					"fs_config_dirs_vendor":  defaultDepCandidateProps(ctx.Config()),
+				},
 				"odm":     newMultilibDeps(),
 				"product": newMultilibDeps(),
 				"system_ext": &map[string]*depCandidateProps{