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

Commit 3ec447b6 authored Sep 10, 2024 by Cole Faust Committed by Automerger Merge Worker Sep 10, 2024

Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main am: dd463004 am: 0776ae42

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3261492

Change-Id: I2045d6f00a14f2d04cd8628ef11a105fc41cef40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6e00bfbb 0776ae42

android/config.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -1828,10 +1828,6 @@ 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

+0 −1

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

python/python.go

+2 −3

Original line number	Diff line number	Diff line
		@@ -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)
		}