Add vendor and odm to autogenerated bp file
Now that repack has support for structs.
Bug: 371030042
Test: Presubmits
Change-Id: I7b62c946c3f8a398d51dd04b80ceebf19645aaba
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 7ef7d99..c3f6349 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -774,9 +774,6 @@
if !fsTypeSupported {
return ""
}
- if partitionType == "vendor" || partitionType == "odm" {
- return "" // TODO: Handle struct props
- }
baseProps := generateBaseProps(proptools.StringPtr(generatedModuleNameForPartition(ctx.Config(), partitionType)))
deps := ctx.Config().Get(fsGenStateOnceKey).(*FsGenState).fsDeps[partitionType]
@@ -784,7 +781,8 @@
result, err := proptools.RepackProperties([]interface{}{baseProps, fsProps, depProps})
if err != nil {
- ctx.ModuleErrorf(err.Error())
+ ctx.ModuleErrorf("%s", err.Error())
+ return ""
}
moduleType := "android_filesystem"