Keep 'partition' in PackagingSpec
Add a property 'partition' to PackagingSpec and fill it when PackagingSpec is created. This will enable PackageModule to filter PackgingSpec based on partition. (Will be used in a follow-up change) Bug: 225121718 Test: m (nothing changes) Change-Id: I7657edd380e215df66bae57d8b07dd4181841fdf
This commit is contained in:
@@ -3119,6 +3119,7 @@ func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, e
|
|||||||
symlinkTarget: "",
|
symlinkTarget: "",
|
||||||
executable: executable,
|
executable: executable,
|
||||||
effectiveLicenseFiles: &licenseFiles,
|
effectiveLicenseFiles: &licenseFiles,
|
||||||
|
partition: fullInstallPath.partition,
|
||||||
}
|
}
|
||||||
m.packagingSpecs = append(m.packagingSpecs, spec)
|
m.packagingSpecs = append(m.packagingSpecs, spec)
|
||||||
return spec
|
return spec
|
||||||
@@ -3236,6 +3237,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src
|
|||||||
srcPath: nil,
|
srcPath: nil,
|
||||||
symlinkTarget: relPath,
|
symlinkTarget: relPath,
|
||||||
executable: false,
|
executable: false,
|
||||||
|
partition: fullInstallPath.partition,
|
||||||
})
|
})
|
||||||
|
|
||||||
return fullInstallPath
|
return fullInstallPath
|
||||||
@@ -3276,6 +3278,7 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str
|
|||||||
srcPath: nil,
|
srcPath: nil,
|
||||||
symlinkTarget: absPath,
|
symlinkTarget: absPath,
|
||||||
executable: false,
|
executable: false,
|
||||||
|
partition: fullInstallPath.partition,
|
||||||
})
|
})
|
||||||
|
|
||||||
return fullInstallPath
|
return fullInstallPath
|
||||||
|
@@ -40,6 +40,8 @@ type PackagingSpec struct {
|
|||||||
executable bool
|
executable bool
|
||||||
|
|
||||||
effectiveLicenseFiles *Paths
|
effectiveLicenseFiles *Paths
|
||||||
|
|
||||||
|
partition string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get file name of installed package
|
// Get file name of installed package
|
||||||
@@ -67,6 +69,10 @@ func (p *PackagingSpec) EffectiveLicenseFiles() Paths {
|
|||||||
return *p.effectiveLicenseFiles
|
return *p.effectiveLicenseFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *PackagingSpec) Partition() string {
|
||||||
|
return p.partition
|
||||||
|
}
|
||||||
|
|
||||||
type PackageModule interface {
|
type PackageModule interface {
|
||||||
Module
|
Module
|
||||||
packagingBase() *PackagingBase
|
packagingBase() *PackagingBase
|
||||||
|
Reference in New Issue
Block a user