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

Add BUILD_BROKEN_PYTHON_IS_PYTHON2

Browse Source 
This provides an escape hatch to undo the effects of
aosp/2417672. It's an enviornment variable instead of
a product config variable because python is often used
during product config.

Bug: 203436762
Test: m nothing and get_build_var with aosp/2458935
Change-Id: I0dd0f7c221427ea487fd7993aef68ce803eaff21
This commit is contained in:
Cole Faust
2023-02-27 12:16:11 -08:00
parent 8ecedd4dfc
commit b1fbc79206
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/build/path.go
View File

@@ -109,6 +109,15 @@ 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)
@@ -244,6 +253,15 @@ 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)