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

Merge "Revert "Add BUILD_BROKEN_PYTHON_IS_PYTHON2"" into main am: 864344a84f

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

Change-Id: Ib4c93762c49698cea20be7292b7b3000979c349d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-10 19:32:56 +00:00
committed by Automerger Merge Worker
parent c8a2c341af 864344a84f
commit 1caf5ca0e6
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/build/path.go
View File

@@ -125,15 +125,6 @@ func SetupLitePath(ctx Context, config Config, tmpDir string) {
prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86") prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86")
myPath = prebuiltsPath + string(os.PathListSeparator) + myPath 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 // Set $PATH to be the directories containing the host tool symlinks, and
// the prebuilts directory for the current host OS. // the prebuilts directory for the current host OS.
config.Environment().Set("PATH", myPath) 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") prebuiltsPath, _ := filepath.Abs("prebuilts/build-tools/path/" + runtime.GOOS + "-x86")
myPath = prebuiltsPath + string(os.PathListSeparator) + myPath 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 // Replace the $PATH variable with the path_interposer symlinks, and
// checked-in prebuilts. // checked-in prebuilts.
config.Environment().Set("PATH", myPath) config.Environment().Set("PATH", myPath)