StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix embedded_launcher can't find files

Browse Source 
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
This commit is contained in:
Nan Zhang
2018-05-31 12:49:33 -07:00
parent 1d2318d6cd
commit bea0975f18
4 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/python_test.go
View File

@@ -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{