StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES

Browse Source 
It's been available for over a year, lets progress the python3 migration
by removing it.

Bug: 203436762
Test: Presubmits
Change-Id: I46a6477ec65e98b7e6df5cc1359f676dcbd0f08e
This commit is contained in:
Cole Faust
2024-09-09 18:08:49 -07:00
parent 219009f606
commit 4ce4f8893e
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1823,10 +1823,6 @@ func (c *deviceConfig) BuildBrokenTrebleSyspropNeverallow() bool {
return c.config.productVariables.BuildBrokenTrebleSyspropNeverallow return c.config.productVariables.BuildBrokenTrebleSyspropNeverallow
} }
func (c *deviceConfig) BuildBrokenUsesSoongPython2Modules() bool {
return c.config.productVariables.BuildBrokenUsesSoongPython2Modules
}
func (c *deviceConfig) BuildDebugfsRestrictionsEnabled() bool { func (c *deviceConfig) BuildDebugfsRestrictionsEnabled() bool {
return c.config.productVariables.BuildDebugfsRestrictionsEnabled return c.config.productVariables.BuildDebugfsRestrictionsEnabled
} }

1
android/variable.go
View File

@@ -445,7 +445,6 @@ type ProductVariables struct {
GenruleSandboxing *bool `json:",omitempty"` GenruleSandboxing *bool `json:",omitempty"`
BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` BuildBrokenEnforceSyspropOwner bool `json:",omitempty"`
BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"` BuildBrokenTrebleSyspropNeverallow bool `json:",omitempty"`
BuildBrokenUsesSoongPython2Modules bool `json:",omitempty"`
BuildBrokenVendorPropertyNamespace bool `json:",omitempty"` BuildBrokenVendorPropertyNamespace bool `json:",omitempty"`
BuildBrokenIncorrectPartitionImages bool `json:",omitempty"` BuildBrokenIncorrectPartitionImages bool `json:",omitempty"`
BuildBrokenInputDirModules []string `json:",omitempty"` BuildBrokenInputDirModules []string `json:",omitempty"`

5
python/python.go
View File

@@ -264,10 +264,9 @@ func (versionSplitTransitionMutator) Split(ctx android.BaseModuleContext) []stri
variants = append(variants, pyVersion3) variants = append(variants, pyVersion3)
} }
if proptools.BoolDefault(props.Version.Py2.Enabled, false) { if proptools.BoolDefault(props.Version.Py2.Enabled, false) {
if !ctx.DeviceConfig().BuildBrokenUsesSoongPython2Modules() && if ctx.ModuleName() != "py2-cmd" &&
ctx.ModuleName() != "py2-cmd" &&
ctx.ModuleName() != "py2-stdlib" { 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) variants = append(variants, pyVersion2)
} }