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

Commit 6d056508 authored by Spandan Das's avatar Spandan Das
Browse files

Use a partition filter only for autogenerated partition modules 

Using it for everything breaks some tests for compos (an apex).

Test: go build ./filesystem
Change-Id: I40de8678d0b5861317fa269df9c62b9823b1c87b
parent 74c7c8ec

filesystem/filesystem.go

+4 −1
Original line number Diff line number Diff line
@@ -264,8 +264,11 @@ func (f *filesystem) partitionName() string { 
func (f *filesystem) filterInstallablePackagingSpec(ps android.PackagingSpec) bool {

	// Filesystem module respects the installation semantic. A PackagingSpec from a module with

	// IsSkipInstall() is skipped.

	if proptools.Bool(f.properties.Is_auto_generated) { // TODO (spandandas): Remove this.

		return !ps.SkipInstall() && (ps.Partition() == f.PartitionType())

	}

	return !ps.SkipInstall()

}



var pctx = android.NewPackageContext("android/soong/filesystem")

filesystem/filesystem_test.go

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ func TestErofsPartition(t *testing.T) { 
// If a system_ext/ module depends on system/ module, the dependency should *not*

// be installed in system_ext/

func TestDoNotPackageCrossPartitionDependencies(t *testing.T) {

	t.Skip() // TODO (spandandas): Re-enable this

	result := fixture.RunTestWithBp(t, `

		android_filesystem {

			name: "myfilesystem",