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

Commit 99c5fe6a authored by Jooyung Han's avatar Jooyung Han
Browse files

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
parent 23ce5b4c

android/module.go

+3 −0
Original line number Diff line number Diff line
@@ -3119,6 +3119,7 @@ func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, e 
		symlinkTarget:         "",

		executable:            executable,

		effectiveLicenseFiles: &licenseFiles,

		partition:             fullInstallPath.partition,

	}

	m.packagingSpecs = append(m.packagingSpecs, spec)

	return spec
@@ -3236,6 +3237,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src 
		srcPath:          nil,

		symlinkTarget:    relPath,

		executable:       false,

		partition:        fullInstallPath.partition,

	})



	return fullInstallPath
@@ -3276,6 +3278,7 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str 
		srcPath:          nil,

		symlinkTarget:    absPath,

		executable:       false,

		partition:        fullInstallPath.partition,

	})



	return fullInstallPath

android/packaging.go

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ type PackagingSpec struct { 
	executable bool



	effectiveLicenseFiles *Paths



	partition string

}



// Get file name of installed package
@@ -67,6 +69,10 @@ func (p *PackagingSpec) EffectiveLicenseFiles() Paths { 
	return *p.effectiveLicenseFiles

}



func (p *PackagingSpec) Partition() string {

	return p.partition

}



type PackageModule interface {

	Module

	packagingBase() *PackagingBase