StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "duplicate_entry_fs" into main am: 543d4f3b7d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066748

Change-Id: I65e536f7de2611e058054b85c83e01a0b2cf2855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-01 03:15:35 +00:00
committed by Automerger Merge Worker
parent 1e414a1f08 543d4f3b7d
commit 86b5f8dcc8
2 changed files with 8 additions and 1 deletions
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"
} }