diff options
author | 2024-09-09 18:08:49 -0700 | |
---|---|---|
committer | 2024-09-09 18:08:49 -0700 | |
commit | 4ce4f8893e5c5ee9b9b2669ceb36a01d85ea39f4 (patch) | |
tree | 1766d38c41b63ffe0192ad8d9c10ef080fa71934 /python | |
parent | 219009f60695ba87d382f03f1de59b9f1b6170b2 (diff) |
Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES
It's been available for over a year, lets progress the python3 migration
by removing it.
Bug: 203436762
Test: Presubmits
Change-Id: I46a6477ec65e98b7e6df5cc1359f676dcbd0f08e
Diffstat (limited to 'python')
-rw-r--r-- | python/python.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/python.go b/python/python.go index 8726f02ef..01ac86c71 100644 --- a/python/python.go +++ b/python/python.go @@ -264,10 +264,9 @@ func (versionSplitTransitionMutator) Split(ctx android.BaseModuleContext) []stri variants = append(variants, pyVersion3) } if proptools.BoolDefault(props.Version.Py2.Enabled, false) { - if !ctx.DeviceConfig().BuildBrokenUsesSoongPython2Modules() && - ctx.ModuleName() != "py2-cmd" && + if ctx.ModuleName() != "py2-cmd" && ctx.ModuleName() != "py2-stdlib" { - ctx.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") + ctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3.") } variants = append(variants, pyVersion2) } |