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

Commit 2f6422cb authored by Anton Hansson's avatar Anton Hansson
Browse files

Support python binaries in sh_test_host 

Make the code for data_bins/data_device_binds module-type agnostic.

Bug: 176581143
Test: m gen_sdk_test
Change-Id: I40e8d4c06f583cae523d97ce63822960872907db
parent 22313cb1

sh/sh_binary.go

+2 −9
Original line number Diff line number Diff line
@@ -345,15 +345,8 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		depTag := ctx.OtherModuleDependencyTag(dep)

		switch depTag {

		case shTestDataBinsTag, shTestDataDeviceBinsTag:

			if cc, isCc := dep.(*cc.Module); isCc {

				s.addToDataModules(ctx, cc.OutputFile().Path().Base(), cc.OutputFile().Path())

				return

			}

			property := "data_bins"

			if depTag == shTestDataDeviceBinsTag {

				property = "data_device_bins"

			}

			ctx.PropertyErrorf(property, "%q of type %q is not supported", dep.Name(), ctx.OtherModuleType(dep))

			path := android.OutputFileForModule(ctx, dep, "")

			s.addToDataModules(ctx, path.Base(), path)

		case shTestDataLibsTag, shTestDataDeviceLibsTag:

			if cc, isCc := dep.(*cc.Module); isCc {

				// Copy to an intermediate output directory to append "lib[64]" to the path,