Merge "Simplify python launcher, use __main__.py"
diff --git a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go
index 1467a02..cc3c1f1 100644
--- a/dexpreopt/dexpreopt_gen/dexpreopt_gen.go
+++ b/dexpreopt/dexpreopt_gen/dexpreopt_gen.go
@@ -133,10 +133,10 @@
depFile := &bytes.Buffer{}
fmt.Fprint(depFile, `: \`+"\n")
- for _, tool := range dexpreoptRule.Tools() {
+ for _, tool := range rule.Tools() {
fmt.Fprintf(depFile, ` %s \`+"\n", tool)
}
- for _, input := range dexpreoptRule.Inputs() {
+ for _, input := range rule.Inputs() {
// Assume the rule that ran the script already has a dependency on the input file passed on the
// command line.
if input != "$1" {
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 6ef7fe9..d4922f3 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -101,7 +101,6 @@
"python3": Allowed,
"realpath": Allowed,
"rsync": Allowed,
- "sed": Allowed,
"sh": Allowed,
"tar": Allowed,
"timeout": Allowed,
@@ -157,6 +156,7 @@
"readlink": LinuxOnlyPrebuilt,
"rm": LinuxOnlyPrebuilt,
"rmdir": LinuxOnlyPrebuilt,
+ "sed": LinuxOnlyPrebuilt,
"setsid": LinuxOnlyPrebuilt,
"sha1sum": LinuxOnlyPrebuilt,
"sha256sum": LinuxOnlyPrebuilt,