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/python_test.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/python_test.go')
| -rw-r--r-- | python/python_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/python/python_test.go b/python/python_test.go index 60a1c82a..e5fe126c 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -44,7 +44,7 @@ var ( badIdentifierErrTemplate = moduleVariantErrTemplate + "srcs: the path %q contains invalid token %q." dupRunfileErrTemplate = moduleVariantErrTemplate + - "found two files to be placed at the same runfiles location %q." + + "found two files to be placed at the same location within zip %q." + " First file: in module %s at path %q." + " Second file: in module %s at path %q." noSrcFileErr = moduleVariantErrTemplate + "doesn't have any source files!" @@ -175,11 +175,11 @@ var ( }, errors: []string{ fmt.Sprintf(badIdentifierErrTemplate, "dir/Blueprints:4:11", - "lib1", "PY3", "runfiles/a/b/c/-e/f/file1.py", "-e"), + "lib1", "PY3", "a/b/c/-e/f/file1.py", "-e"), fmt.Sprintf(badIdentifierErrTemplate, "dir/Blueprints:4:11", - "lib1", "PY3", "runfiles/a/b/c/.file1.py", ".file1"), + "lib1", "PY3", "a/b/c/.file1.py", ".file1"), fmt.Sprintf(badIdentifierErrTemplate, "dir/Blueprints:4:11", - "lib1", "PY3", "runfiles/a/b/c/123/file1.py", "123"), + "lib1", "PY3", "a/b/c/123/file1.py", "123"), }, }, { @@ -212,7 +212,7 @@ var ( }, errors: []string{ fmt.Sprintf(dupRunfileErrTemplate, "dir/Blueprints:9:6", - "lib2", "PY3", "runfiles/a/b/c/file1.py", "lib2", "dir/file1.py", + "lib2", "PY3", "a/b/c/file1.py", "lib2", "dir/file1.py", "lib1", "dir/c/file1.py"), }, }, @@ -307,10 +307,10 @@ var ( name: "bin", actualVersion: "PY3", pyRunfiles: []string{ - "runfiles/e/default.py", - "runfiles/e/bin.py", - "runfiles/e/default_py3.py", - "runfiles/e/file4.py", + "e/default.py", + "e/bin.py", + "e/default_py3.py", + "e/file4.py", }, srcsZip: "@prefix@/.intermediates/dir/bin/PY3/bin.py.srcszip", depsSrcsZips: []string{ |