Merge "Add vendor and odm to autogenerated bp file" into main (8d50217c) · Commits · e / os / android_build_soong

fsgen/filesystem_creator.go

+2 −4

Original line number	Diff line number	Diff line
		@@ -454,9 +454,6 @@ func generateBpContent(ctx android.EarlyModuleContext, partitionType string) str
		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]
		@@ -464,7 +461,8 @@ func generateBpContent(ctx android.EarlyModuleContext, partitionType string) str

		result, err := proptools.RepackProperties([]interface{}{baseProps, fsProps, depProps})
		if err != nil {
		ctx.ModuleErrorf(err.Error())
		ctx.ModuleErrorf("%s", err.Error())
		return ""
		}

		moduleType := "android_filesystem"