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

Commit d737d02f authored by Liz Kammer's avatar Liz Kammer
Browse files

Add comments/refactor for python.go 

Test: all soong tests
Test: m nothing
Change-Id: Ib3b95d7c2831b97026e76a39af515fd51c6cb2c7
parent 882c0425

python/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ func NewBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator) { 
func PythonBinaryHostFactory() android.Module {

	module, _ := NewBinary(android.HostSupported)



	return module.Init()

	return module.init()

}



func (binary *binaryDecorator) autorun() bool {

python/library.go

+2 −2
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ func init() { 
func PythonLibraryHostFactory() android.Module {

	module := newModule(android.HostSupported, android.MultilibFirst)



	return module.Init()

	return module.init()

}



func PythonLibraryFactory() android.Module {

	module := newModule(android.HostAndDeviceSupported, android.MultilibBoth)



	return module.Init()

	return module.init()

}

python/python.go

+210 −162

File changed.

Preview size limit exceeded, changes collapsed.

python/python_test.go

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ var ( 
	pkgPathErrTemplate       = moduleVariantErrTemplate +

		"pkg_path: %q must be a relative path contained in par file."

	badIdentifierErrTemplate = moduleVariantErrTemplate +

		"srcs: the path %q contains invalid token %q."

		"srcs: the path %q contains invalid subpath %q."

	dupRunfileErrTemplate = moduleVariantErrTemplate +

		"found two files to be placed at the same location within zip %q." +

		" First file: in module %s at path %q." +
@@ -370,7 +370,7 @@ func expectErrors(t *testing.T, actErrs []error, expErrs []string) (testErrs []e 
	} else {

		sort.Strings(expErrs)

		for i, v := range actErrStrs {

			if v != expErrs[i] {

			if !strings.Contains(v, expErrs[i]) {

				testErrs = append(testErrs, errors.New(v))

			}

		}

python/test.go

+2 −2
Original line number Diff line number Diff line
@@ -108,12 +108,12 @@ func NewTest(hod android.HostOrDeviceSupported) *Module { 
func PythonTestHostFactory() android.Module {

	module := NewTest(android.HostSupportedNoCross)



	return module.Init()

	return module.init()

}



func PythonTestFactory() android.Module {

	module := NewTest(android.HostAndDeviceSupported)

	module.multilib = android.MultilibBoth



	return module.Init()

	return module.init()

}