diff options
| author | 2024-05-01 09:59:21 +0000 | |
|---|---|---|
| committer | 2024-05-01 09:59:21 +0000 | |
| commit | 0141b4acad94d7ccffd6fbbce3cba5eae48a9b95 (patch) | |
| tree | 4401ac8e4a8a9350489d781c99c0ad7ffbbc9721 /filesystem/filesystem.go | |
| parent | 543d4f3b7d7cb403e3c951e0846c9464a32daaf7 (diff) | |
| parent | 3d65d9cb901a73e63398d31352f3e422d7a68b90 (diff) | |
Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main
* changes:
Revert "Prevent multiple PackagingSpecs having same installation..."
Revert "Filesystem modules follow the installation semantic"
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 5bcfce7a3..cadf9c246 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -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) { |