diff options
| author | 2024-11-07 20:47:49 +0000 | |
|---|---|---|
| committer | 2024-11-07 20:47:49 +0000 | |
| commit | 50cb131c37f5da3a9a9a2b51ac3a954e1ad81795 (patch) | |
| tree | a6146874fef734dd093d6c444795f22b24c35cd1 /filesystem/android_device.go | |
| parent | 1fa1c6db4f4d862f20b4789be4bc98e7f9be7c06 (diff) | |
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
Diffstat (limited to 'filesystem/android_device.go')
| -rw-r--r-- | filesystem/android_device.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 2645dc498..9071272c1 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -34,8 +34,6 @@ type PartitionNameProperties struct { 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 @@ func AndroidDeviceFactory() android.Module { module := &androidDevice{} module.AddProperties(&module.partitionProps) android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon) + return module } @@ -70,9 +69,6 @@ func (a *androidDevice) DepsMutator(ctx android.BottomUpMutatorContext) { 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) { |