diff options
| author | 2018-05-22 14:50:18 -0700 | |
|---|---|---|
| committer | 2018-05-23 03:33:36 +0000 | |
| commit | f0c4e4339ab460f47f431baf44cfb4fea41d9b14 (patch) | |
| tree | 1c37a006c020846909d18985744e3f5fc7694b50 /python/proto.go | |
| parent | d0ce8e8aabe7445377fe7307572df89394df21c9 (diff) | |
Fix Protobuf importing issue for embedded Python
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
Diffstat (limited to 'python/proto.go')
| -rw-r--r-- | python/proto.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/python/proto.go b/python/proto.go index 42987fab9..2370cd26d 100644 --- a/python/proto.go +++ b/python/proto.go @@ -30,14 +30,14 @@ var ( blueprint.RuleParams{ Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` + `$protocCmd --python_out=$out.tmp --dependency_out=$out.d -I $protoBase $protoFlags $in && ` + - `$parCmd -o $out -P $pkgPath -C $out.tmp -D $out.tmp && rm -rf $out.tmp`, + `$parCmd -o $out $pkgPathArgs -C $out.tmp -D $out.tmp && rm -rf $out.tmp`, CommandDeps: []string{ "$protocCmd", "$parCmd", }, Depfile: "${out}.d", Deps: blueprint.DepsGCC, - }, "protoBase", "protoFlags", "pkgPath") + }, "protoBase", "protoFlags", "pkgPathArgs") ) func genProto(ctx android.ModuleContext, p *android.ProtoProperties, @@ -53,15 +53,19 @@ func genProto(ctx android.ModuleContext, p *android.ProtoProperties, protoBase = strings.TrimSuffix(protoFile.String(), protoFile.Rel()) } + var pkgPathArgs string + if pkgPath != "" { + pkgPathArgs = "-P " + pkgPath + } ctx.Build(pctx, android.BuildParams{ Rule: proto, Description: "protoc " + protoFile.Rel(), Output: srcJarFile, Input: protoFile, Args: map[string]string{ - "protoBase": protoBase, - "protoFlags": strings.Join(protoFlags, " "), - "pkgPath": pkgPath, + "protoBase": protoBase, + "protoFlags": strings.Join(protoFlags, " "), + "pkgPathArgs": pkgPathArgs, }, }) |