Revert "Build vbmeta partitions with soong"
Revert submission 3341139-vbmeta_partitions_in_soong
Reason for revert: DroidMonitor: Potential culprit for http://b/377943457.
Reverted changes: /q/submissionid:3341139-vbmeta_partitions_in_soong
Change-Id: I7a3aeacc91f17832688ee4d917cdee34db5d4a1b
diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 2645dc4..9071272 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -34,8 +34,6 @@
Vendor_partition_name *string
// Name of the Odm partition filesystem module
Odm_partition_name *string
- // The vbmeta partition and its "chained" partitions
- Vbmeta_partitions []string
}
type androidDevice struct {
@@ -48,6 +46,7 @@
module := &androidDevice{}
module.AddProperties(&module.partitionProps)
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
+
return module
}
@@ -70,9 +69,6 @@
addDependencyIfDefined(a.partitionProps.Product_partition_name)
addDependencyIfDefined(a.partitionProps.Vendor_partition_name)
addDependencyIfDefined(a.partitionProps.Odm_partition_name)
- for _, vbmetaPartition := range a.partitionProps.Vbmeta_partitions {
- ctx.AddDependency(ctx.Module(), filesystemDepTag, vbmetaPartition)
- }
}
func (a *androidDevice) GenerateAndroidBuildActions(ctx android.ModuleContext) {