From bea0975f1882a8741dc3e9abe2bd69f7067953db Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Thu, 31 May 2018 12:49:33 -0700 Subject: 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 --- python/builder.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'python/builder.go') 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(), -- cgit v1.2.3