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

Commit 6e00bfbb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add BUILD_BROKEN_PYTHON_IS_PYTHON2"" into main am: 864344a8 am: 1caf5ca0 

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



Change-Id: If18625d42160c96f1023e8e61c8475c10e41677f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89654590 1caf5ca0

ui/build/path.go

+0 −18
Original line number Diff line number Diff line
@@ -125,15 +125,6 @@ func SetupLitePath(ctx Context, config Config, tmpDir string) { 
	prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86")

	myPath = prebuiltsPath + string(os.PathListSeparator) + myPath



	if value, _ := config.Environment().Get("BUILD_BROKEN_PYTHON_IS_PYTHON2"); value == "true" {

		py2Path, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86/py2")

		if info, err := os.Stat(py2Path); err == nil && info.IsDir() {

			myPath = py2Path + string(os.PathListSeparator) + myPath

		}

	} else if value != "" {

		ctx.Fatalf("BUILD_BROKEN_PYTHON_IS_PYTHON2 can only be set to 'true' or an empty string, but got %s\n", value)

	}



	// Set $PATH to be the directories containing the host tool symlinks, and

	// the prebuilts directory for the current host OS.

	config.Environment().Set("PATH", myPath)
@@ -270,15 +261,6 @@ func SetupPath(ctx Context, config Config) { 
	prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86")

	myPath = prebuiltsPath + string(os.PathListSeparator) + myPath



	if value, _ := config.Environment().Get("BUILD_BROKEN_PYTHON_IS_PYTHON2"); value == "true" {

		py2Path, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86/py2")

		if info, err := os.Stat(py2Path); err == nil && info.IsDir() {

			myPath = py2Path + string(os.PathListSeparator) + myPath

		}

	} else if value != "" {

		ctx.Fatalf("BUILD_BROKEN_PYTHON_IS_PYTHON2 can only be set to 'true' or an empty string, but got %s\n", value)

	}



	// Replace the $PATH variable with the path_interposer symlinks, and

	// checked-in prebuilts.

	config.Environment().Set("PATH", myPath)