diff options
| author | 2023-03-10 07:04:02 +0000 | |
|---|---|---|
| committer | 2023-03-10 07:04:02 +0000 | |
| commit | 6167240026e5e6dfda495d9d7aa37a78f3d62a9e (patch) | |
| tree | 7728aa3be86e2ea7cfb3c75a02a722194e73eb14 /python/python.go | |
| parent | f183fc5413dbbffa0fd9674dafc7422eec805ec6 (diff) | |
| parent | 944053e52deb21a449d666b18b52ee9cd4ac408f (diff) | |
Merge "Make using python 2 an error" am: 944053e52d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212957
Change-Id: I5a475da6231b8e43aa188592d7977390ae916be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'python/python.go')
| -rw-r--r-- | python/python.go | 6 |
1 files changed, 6 insertions, 0 deletions
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) } |