tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert^2 "Filesystem modules follow the installation semantic"

Browse source 
54351867fa

Change-Id: I12010c1013fc9dad19d259ba7b0251ac8e8e0907
This commit is contained in:
Jiyong Park 2024-05-01 12:36:10 +00:00
parent 16ef7ac14e
commit 7e7d4af6b5
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
filesystem/filesystem.go
View file

@ -137,6 +137,7 @@ type filesystemProperties struct {
// partitions like system.img. For example, cc_library modules are placed under ./lib[64] directory. // partitions like system.img. For example, cc_library modules are placed under ./lib[64] directory.
func filesystemFactory() android.Module { func filesystemFactory() android.Module {
module := &filesystem{} module := &filesystem{}
module.filterPackagingSpec = module.filterInstallablePackagingSpec
initFilesystemModule(module) initFilesystemModule(module)
return module return module
} }
@ -189,6 +190,12 @@ func (f *filesystem) partitionName() string {
return proptools.StringDefault(f.properties.Partition_name, f.Name()) 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") var pctx = android.NewPackageContext("android/soong/filesystem")
func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) {

2
filesystem/system_image.go
View file

@ -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 // Note that "apex" module installs its contents to "apex"(fake partition) as well
// for symbol lookup by imitating "activated" paths. // for symbol lookup by imitating "activated" paths.
func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool { func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool {
return ps.Partition() == "system" return s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system"
} }