From edc4c505f9cad536b527a5f26852f6844df3c05e Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 9 Sep 2022 19:39:25 -0700 Subject: Make using python 2 an error Except if BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES is set, and except for some core py2 modules that can't be removed until python2 is fully gone. Bug: 203436762 Test: m nothing Change-Id: I62ccb6f5687eab1e79c372ffc234a90ca5b566ac --- python/python.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'python/python.go') diff --git a/python/python.go b/python/python.go index 0ae7b3691..c7c523dfb 100644 --- a/python/python.go +++ b/python/python.go @@ -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) } -- cgit v1.2.3-59-g8ed1b