stub_template_host.txt added all the top-level modules to the PYTHONPATH, which isn't correct, and caused absl.logging to override the built-in logging module. Removing this also makes it more consistent with python binaries built with embedded_launcher: true. embedded_launcher: true binaries don't add the top-level modules. Fixes: 245583294 Test: m py_dont_add_top_level_dirs_test && out/host/linux-x86/testcases/py_dont_add_top_level_dirs_test/x86_64/py_dont_add_top_level_dirs_test Change-Id: Id3069565d2b2c4b2bda0ff5301e757a7b4201751
141 lines
4.5 KiB
Go
141 lines
4.5 KiB
Go
// Copyright 2017 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package python
|
|
|
|
// This file contains Ninja build actions for building Python program.
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"android/soong/android"
|
|
|
|
"github.com/google/blueprint"
|
|
_ "github.com/google/blueprint/bootstrap"
|
|
)
|
|
|
|
var (
|
|
pctx = android.NewPackageContext("android/soong/python")
|
|
|
|
zip = pctx.AndroidStaticRule("zip",
|
|
blueprint.RuleParams{
|
|
Command: `$parCmd -o $out $args`,
|
|
CommandDeps: []string{"$parCmd"},
|
|
},
|
|
"args")
|
|
|
|
combineZip = pctx.AndroidStaticRule("combineZip",
|
|
blueprint.RuleParams{
|
|
Command: `$mergeParCmd $out $in`,
|
|
CommandDeps: []string{"$mergeParCmd"},
|
|
},
|
|
)
|
|
|
|
hostPar = pctx.AndroidStaticRule("hostPar",
|
|
blueprint.RuleParams{
|
|
Command: `sed -e 's/%interpreter%/$interp/g' -e 's/%main%/$main/g' -e 's/ADD_TOP_DIRECTORIES_TO_PATH/$addTopDirectoriesToPath/g' build/soong/python/scripts/stub_template_host.txt > $out.main && ` +
|
|
`echo "#!/usr/bin/env $interp" >${out}.prefix &&` +
|
|
`$mergeParCmd -p --prefix ${out}.prefix -pm $out.main $out $srcsZips && ` +
|
|
`chmod +x $out && (rm -f $out.main; rm -f ${out}.prefix)`,
|
|
CommandDeps: []string{"$mergeParCmd", "build/soong/python/scripts/stub_template_host.txt"},
|
|
},
|
|
"interp", "main", "srcsZips", "addTopDirectoriesToPath")
|
|
|
|
embeddedPar = pctx.AndroidStaticRule("embeddedPar",
|
|
blueprint.RuleParams{
|
|
Command: `rm -f $out.main && ` +
|
|
`sed 's/ENTRY_POINT/$main/' build/soong/python/scripts/main.py >$out.main &&` +
|
|
`$mergeParCmd -p -pm $out.main --prefix $launcher $out $srcsZips && ` +
|
|
`chmod +x $out && rm -rf $out.main`,
|
|
CommandDeps: []string{"$mergeParCmd", "$parCmd", "build/soong/python/scripts/main.py"},
|
|
},
|
|
"main", "srcsZips", "launcher")
|
|
|
|
embeddedParNoMain = pctx.AndroidStaticRule("embeddedParNoMain",
|
|
blueprint.RuleParams{
|
|
Command: `$mergeParCmd -p --prefix $launcher $out $srcsZips && ` +
|
|
`chmod +x $out`,
|
|
CommandDeps: []string{"$mergeParCmd"},
|
|
},
|
|
"srcsZips", "launcher")
|
|
)
|
|
|
|
func init() {
|
|
pctx.Import("github.com/google/blueprint/bootstrap")
|
|
pctx.Import("android/soong/android")
|
|
|
|
pctx.HostBinToolVariable("parCmd", "soong_zip")
|
|
pctx.HostBinToolVariable("mergeParCmd", "merge_zips")
|
|
}
|
|
|
|
func registerBuildActionForParFile(ctx android.ModuleContext, embeddedLauncher bool,
|
|
launcherPath android.OptionalPath, interpreter, main, binName string,
|
|
srcsZips android.Paths, addTopDirectoriesToPath bool) android.Path {
|
|
|
|
// .intermediate output path for bin executable.
|
|
binFile := android.PathForModuleOut(ctx, binName)
|
|
|
|
// implicit dependency for parFile build action.
|
|
implicits := srcsZips
|
|
|
|
if !embeddedLauncher {
|
|
addDirsString := "False"
|
|
if addTopDirectoriesToPath {
|
|
addDirsString = "True"
|
|
}
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: hostPar,
|
|
Description: "host python archive",
|
|
Output: binFile,
|
|
Implicits: implicits,
|
|
Args: map[string]string{
|
|
"interp": strings.Replace(interpreter, "/", `\/`, -1),
|
|
"main": strings.Replace(main, "/", `\/`, -1),
|
|
"srcsZips": strings.Join(srcsZips.Strings(), " "),
|
|
"addTopDirectoriesToPath": addDirsString,
|
|
},
|
|
})
|
|
} else if launcherPath.Valid() {
|
|
// added launcherPath to the implicits Ninja dependencies.
|
|
implicits = append(implicits, launcherPath.Path())
|
|
|
|
if main == "" {
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: embeddedParNoMain,
|
|
Description: "embedded python archive",
|
|
Output: binFile,
|
|
Implicits: implicits,
|
|
Args: map[string]string{
|
|
"srcsZips": strings.Join(srcsZips.Strings(), " "),
|
|
"launcher": launcherPath.String(),
|
|
},
|
|
})
|
|
} else {
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: embeddedPar,
|
|
Description: "embedded python archive",
|
|
Output: binFile,
|
|
Implicits: implicits,
|
|
Args: map[string]string{
|
|
"main": strings.Replace(strings.TrimSuffix(main, pyExt), "/", ".", -1),
|
|
"srcsZips": strings.Join(srcsZips.Strings(), " "),
|
|
"launcher": launcherPath.String(),
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
return binFile
|
|
}
|