diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-05-23 20:24:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-23 20:24:42 +0000 |
commit | 78a01965d077fef952a228ab4a9a0cd1cb51670a (patch) | |
tree | ccb9f0efb4c54b23fa66140fe3d380da83b1a782 /python | |
parent | a0a7fc16bfb8a945ac1642242af642ed99360d93 (diff) | |
parent | f0c4e4339ab460f47f431baf44cfb4fea41d9b14 (diff) | |
download | build_soong-78a01965d077fef952a228ab4a9a0cd1cb51670a.tar.gz build_soong-78a01965d077fef952a228ab4a9a0cd1cb51670a.tar.bz2 build_soong-78a01965d077fef952a228ab4a9a0cd1cb51670a.zip |
Merge "Fix Protobuf importing issue for embedded Python"
Diffstat (limited to 'python')
-rw-r--r-- | python/proto.go | 14 | ||||
-rw-r--r-- | python/python.go | 16 |
2 files changed, 20 insertions, 10 deletions
diff --git a/python/proto.go b/python/proto.go index 42987fab..2370cd26 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, }, }) diff --git a/python/python.go b/python/python.go index a2779886..65e3efd4 100644 --- a/python/python.go +++ b/python/python.go @@ -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) |