Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54351867 authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Revert "Filesystem modules follow the installation semantic" 

Revert submission 3066748-duplicate_entry_fs

Reason for revert: b/338159248

Reverted changes: /q/submissionid:3066748-duplicate_entry_fs

Change-Id: I8aacdb36efce8343c3713542eee209e71bde660b
parent 742f54c4

filesystem/filesystem.go

+0 −7
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ type filesystemProperties struct { 
// partitions like system.img. For example, cc_library modules are placed under ./lib[64] directory.

func filesystemFactory() android.Module {

	module := &filesystem{}

	module.filterPackagingSpec = module.filterInstallablePackagingSpec

	initFilesystemModule(module)

	return module

}
@@ -190,12 +189,6 @@ func (f *filesystem) partitionName() string { 
	return proptools.StringDefault(f.properties.Partition_name, f.Name())

}



func (f *filesystem) filterInstallablePackagingSpec(ps android.PackagingSpec) bool {

	// Filesystem module respects the installation semantic. A PackagingSpec from a module with

	// IsSkipInstall() is skipped.

	return !ps.SkipInstall()

}



var pctx = android.NewPackageContext("android/soong/filesystem")



func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) {

filesystem/system_image.go

+1 −1
Original line number Diff line number Diff line
@@ -98,5 +98,5 @@ func (s *systemImage) buildLinkerConfigFile(ctx android.ModuleContext, root andr 
// Note that "apex" module installs its contents to "apex"(fake partition) as well

// for symbol lookup by imitating "activated" paths.

func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool {

	return s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system"

	return ps.Partition() == "system"

}