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

Commit ee45d33c authored by Cole Faust's avatar Cole Faust
Browse files

Include device_common_data in python test data 

Device_common_data was packaging the data into the python executable,
but some tests also distribute the data externally from the executable,
and those external distrobutions weren't picking up device_common_data.

Bug: 372091092
Test: m nothing
Change-Id: Id5678c11a609c9d63d4935f2aa7c469059c017d7
parent b70d6238

python/test.go

+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ type TestProperties struct { 
	// the test

	Data []string `android:"path,arch_variant"`



	// Same as data, but will add dependencies on modules using the device's os variation and

	// the common arch variation. Useful for a host test that wants to embed a module built for

	// device.

	Device_common_data []string `android:"path_device_common"`



	// list of java modules that provide data that should be installed alongside the test.

	Java_data []string
@@ -183,6 +188,9 @@ func (p *PythonTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext 
	for _, dataSrcPath := range android.PathsForModuleSrc(ctx, p.testProperties.Data) {

		p.data = append(p.data, android.DataPath{SrcPath: dataSrcPath})

	}

	for _, dataSrcPath := range android.PathsForModuleSrc(ctx, p.testProperties.Device_common_data) {

		p.data = append(p.data, android.DataPath{SrcPath: dataSrcPath})

	}



	if p.isTestHost() && len(p.testProperties.Data_device_bins_both) > 0 {

		ctx.VisitDirectDepsWithTag(dataDeviceBinsTag, func(dep android.Module) {