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

Commit 944053e5 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Make using python 2 an error"

parents f42c21d5 edc4c505

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,10 @@ func (c *deviceConfig) BuildBrokenTrebleSyspropNeverallow() bool { 
	return c.config.productVariables.BuildBrokenTrebleSyspropNeverallow

}



func (c *deviceConfig) BuildBrokenUsesSoongPython2Modules() bool {

	return c.config.productVariables.BuildBrokenUsesSoongPython2Modules

}



func (c *deviceConfig) BuildDebugfsRestrictionsEnabled() bool {

	return c.config.productVariables.BuildDebugfsRestrictionsEnabled

}

android/variable.go

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ type productVariables struct { 
	BuildBrokenDepfile                 *bool    `json:",omitempty"`

	BuildBrokenEnforceSyspropOwner     bool     `json:",omitempty"`

	BuildBrokenTrebleSyspropNeverallow bool     `json:",omitempty"`

	BuildBrokenUsesSoongPython2Modules bool     `json:",omitempty"`

	BuildBrokenVendorPropertyNamespace bool     `json:",omitempty"`

	BuildBrokenInputDirModules         []string `json:",omitempty"`

python/python.go

+6 −0
Original line number Diff line number Diff line
@@ -263,6 +263,12 @@ func versionSplitMutator() func(android.BottomUpMutatorContext) { 
				versionProps = append(versionProps, props.Version.Py3)

			}

			if proptools.BoolDefault(props.Version.Py2.Enabled, false) {

				if !mctx.DeviceConfig().BuildBrokenUsesSoongPython2Modules() &&

					mctx.ModuleName() != "par_test" &&

					mctx.ModuleName() != "py2-cmd" &&

					mctx.ModuleName() != "py2-stdlib" {

					mctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3. This error can be temporarily overridden by setting BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES := true in the product configuration")

				}

				versionNames = append(versionNames, pyVersion2)

				versionProps = append(versionProps, props.Version.Py2)

			}