From 41e4c99884579719d13712c1f94c553cba5ff767 Mon Sep 17 00:00:00 2001 From: "Priyanka Advani (xWF)" Date: Fri, 11 Oct 2024 16:53:20 +0000 Subject: Revert "Create an empty system_ext partition for aosp_cf_*" This reverts commit efc456a762db406022537b696a1d6eae73880f9a. Reason for revert: Droidmonitor created revert due to b/372912729. Will be verifying through ABTD before submission. Change-Id: I6719919a4badf4d8a89765154b4c92c53fb6f293 --- filesystem/filesystem.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 1ab07a2e7..87c6381c0 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -198,10 +198,6 @@ const ( unknown ) -func (fs fsType) IsUnknown() bool { - return fs == unknown -} - type FilesystemInfo struct { // A text file containing the list of paths installed on the partition. FileListFile android.Path @@ -209,7 +205,8 @@ type FilesystemInfo struct { var FilesystemProvider = blueprint.NewProvider[FilesystemInfo]() -func GetFsTypeFromString(ctx android.EarlyModuleContext, typeStr string) fsType { +func (f *filesystem) fsType(ctx android.ModuleContext) fsType { + typeStr := proptools.StringDefault(f.properties.Type, "ext4") switch typeStr { case "ext4": return ext4Type @@ -223,11 +220,6 @@ func GetFsTypeFromString(ctx android.EarlyModuleContext, typeStr string) fsType ctx.PropertyErrorf("type", "%q not supported", typeStr) return unknown } - -} - -func (f *filesystem) fsType(ctx android.ModuleContext) fsType { - return GetFsTypeFromString(ctx, proptools.StringDefault(f.properties.Type, "ext4")) } func (f *filesystem) installFileName() string { -- cgit v1.2.3-59-g8ed1b