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

Fix Protobuf importing issue for embedded Python

Browse Source 
As I mentioned in b/79751992 #4, when launcher loads __main__ as entry point,
the module dict got set using absolute pkg path which
was runfiles.google.protobuf which caused the type checking failed
(expected: google.protobuf for type()). After then, starting with non entrypoint
python files, the importing module dict would be set with from...import...

So remove dir:runfiles/ from zip section so that during entrypoint Python file
importing the proto files using
from...import..., the type checking can be passed.

Bug: b/79751992
Test: m clean && m out/host/linux-x86/bin/perf_proto_stack;
And execute it:
usage: perf_proto_stack [-h] [--syms SYMS] [--json-out JSON_OUT]
                        [--print-samples] [--skip-kernel-syms]
                        [--print-pid-histogram] [--print-sym-histogram]
                        [--print-dso-histogram] [--parallel PARALLEL]
                        file [file ...]
perf_proto_stack: error: too few arguments

Change-Id: I95a4a9ee95ce7f90d893ea0529c384d7b944abe4
This commit is contained in:
Nan Zhang
2018-05-22 14:50:18 -07:00
parent d0ce8e8aab
commit f0c4e4339a
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/python.go
View File

@@ -420,16 +420,20 @@ func (p *Module) GeneratePythonBuildActions(ctx android.ModuleContext) {
// pkg_path starts from "internal/" implicitly.
pkgPath = filepath.Join(internal, pkgPath)
} else {
// pkg_path starts from "runfiles/" implicitly.
pkgPath = filepath.Join(runFiles, pkgPath)
if !p.isEmbeddedLauncherEnabled(p.properties.Actual_version) {
// pkg_path starts from "runfiles/" implicitly.
pkgPath = filepath.Join(runFiles, pkgPath)
}
}
} else {
if p.properties.Is_internal != nil && *p.properties.Is_internal {
// pkg_path starts from "runfiles/" implicitly.
pkgPath = internal
} else {
// pkg_path starts from "runfiles/" implicitly.
pkgPath = runFiles
if !p.isEmbeddedLauncherEnabled(p.properties.Actual_version) {
// pkg_path starts from "runfiles/" implicitly.
pkgPath = runFiles
}
}
}
@@ -520,7 +524,9 @@ func (p *Module) createSrcsZip(ctx android.ModuleContext, pkgPath string) androi
sort.Strings(keys)
parArgs := []string{}
parArgs = append(parArgs, `-P `+pkgPath)
if pkgPath != "" {
parArgs = append(parArgs, `-P `+pkgPath)
}
implicits := android.Paths{}
for _, k := range keys {
parArgs = append(parArgs, `-C `+k)