diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-05-31 12:49:33 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-06-04 12:32:55 -0700 |
| commit | bea0975f1882a8741dc3e9abe2bd69f7067953db (patch) | |
| tree | c561f9cb883ba11a31a69e5a02f735d4d9a926d9 /python/builder.go | |
| parent | 1d2318d6cd9b7f64178afb4e3a8ce481dd603bbf (diff) | |
| download | android_build_soong-bea0975f1882a8741dc3e9abe2bd69f7067953db.tar.gz android_build_soong-bea0975f1882a8741dc3e9abe2bd69f7067953db.tar.bz2 android_build_soong-bea0975f1882a8741dc3e9abe2bd69f7067953db.zip | |
Fix embedded_launcher can't find files
The problem came from Python libraries doesn't know the information that
we enabled embedded_launcher (only Python binary knows about that). And
we can't simply remove runfiles dir for Python libraries since host
Python mode need this.
Bug: b/80441699
Test: m perf_profo_flames
Change-Id: I73ffc4d7504f95a708ae7cca47bc6c15a673aa31
Diffstat (limited to 'python/builder.go')
| -rw-r--r-- | python/builder.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/python/builder.go b/python/builder.go index 969f9efd..ec4cb4ea 100644 --- a/python/builder.go +++ b/python/builder.go @@ -96,11 +96,8 @@ func registerBuildActionForParFile(ctx android.ModuleContext, embeddedLauncher b Output: binFile, Implicits: implicits, Args: map[string]string{ - "interp": strings.Replace(interpreter, "/", `\/`, -1), - // we need remove "runfiles/" suffix since stub script starts - // searching for main file in each sub-dir of "runfiles" directory tree. - "main": strings.Replace(strings.TrimPrefix(main, runFiles+"/"), - "/", `\/`, -1), + "interp": strings.Replace(interpreter, "/", `\/`, -1), + "main": strings.Replace(main, "/", `\/`, -1), "template": template.String(), "stub": stub, "mergedZip": mergedZip.String(), |