f0c4e4339a
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
73 lines
2 KiB
Go
73 lines
2 KiB
Go
// Copyright 2017 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package python
|
|
|
|
import (
|
|
"android/soong/android"
|
|
"strings"
|
|
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
func init() {
|
|
pctx.HostBinToolVariable("protocCmd", "aprotoc")
|
|
}
|
|
|
|
var (
|
|
proto = pctx.AndroidStaticRule("protoc",
|
|
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 $pkgPathArgs -C $out.tmp -D $out.tmp && rm -rf $out.tmp`,
|
|
CommandDeps: []string{
|
|
"$protocCmd",
|
|
"$parCmd",
|
|
},
|
|
Depfile: "${out}.d",
|
|
Deps: blueprint.DepsGCC,
|
|
}, "protoBase", "protoFlags", "pkgPathArgs")
|
|
)
|
|
|
|
func genProto(ctx android.ModuleContext, p *android.ProtoProperties,
|
|
protoFile android.Path, protoFlags []string, pkgPath string) android.Path {
|
|
srcJarFile := android.PathForModuleGen(ctx, protoFile.Base()+".srcszip")
|
|
|
|
protoRoot := android.ProtoCanonicalPathFromRoot(ctx, p)
|
|
|
|
var protoBase string
|
|
if protoRoot {
|
|
protoBase = "."
|
|
} else {
|
|
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, " "),
|
|
"pkgPathArgs": pkgPathArgs,
|
|
},
|
|
})
|
|
|
|
return srcJarFile
|
|
}
|