commit 385f75bfacf3a29949e3acbccd0cbc9baf347ee4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Nov 16 01:25:36 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 16 01:25:36 2024 +0000
tree d5df26dd1160e87b872430bdb887078370bed858
parent fb9cd1703bd3edb381400e4b8678060def78d5fe
parent 54de178b76163b6909d2641709ae6d4d0aa4cb3a

Merge "Remove unnecessary base_dir property value overrides" into main

fsgen/filesystem_creator.go

diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 4d15b4b..7daefcb 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -218,7 +218,6 @@
 				Name:   proptools.StringPtr("system/lib/modules"),
 			},
 		}
-		fsProps.Base_dir = proptools.StringPtr("system")
 	case "system_ext":
 		fsProps.Fsverity.Inputs = []string{
 			"framework/*",
@@ -240,7 +239,6 @@
 				Name:   proptools.StringPtr("vendor/lib/modules"),
 			},
 		}
-		fsProps.Base_dir = proptools.StringPtr("vendor")
 	case "odm":
 		fsProps.Symlinks = []filesystem.SymlinkDefinition{
 			filesystem.SymlinkDefinition{
@@ -248,7 +246,6 @@
 				Name:   proptools.StringPtr("odm/lib/modules"),
 			},
 		}
-		fsProps.Base_dir = proptools.StringPtr("odm")
 	case "userdata":
 		fsProps.Base_dir = proptools.StringPtr("data")