diff options
Diffstat (limited to 'python/python.go')
| -rw-r--r-- | python/python.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/python/python.go b/python/python.go index 7d77ca772..d3cbd7695 100644 --- a/python/python.go +++ b/python/python.go @@ -129,7 +129,6 @@ type pathMapping struct { type PythonLibraryModule struct { android.ModuleBase android.DefaultableModuleBase - android.BazelModuleBase properties BaseProperties protoProperties android.ProtoProperties @@ -197,14 +196,6 @@ func (p *PythonLibraryModule) getPkgPath() string { return String(p.properties.Pkg_path) } -// PkgPath is the "public" version of `getPkgPath` that is only available during bp2build -func (p *PythonLibraryModule) PkgPath(ctx android.BazelConversionContext) *string { - if ctx.Config().BuildMode != android.Bp2build { - ctx.ModuleErrorf("PkgPath is only supported in bp2build mode") - } - return p.properties.Pkg_path -} - func (p *PythonLibraryModule) getBaseProperties() *BaseProperties { return &p.properties } @@ -215,7 +206,6 @@ func (p *PythonLibraryModule) init() android.Module { p.AddProperties(&p.properties, &p.protoProperties) android.InitAndroidArchModule(p, p.hod, p.multilib) android.InitDefaultableModule(p) - android.InitBazelModule(p) return p } @@ -430,6 +420,7 @@ func (p *PythonLibraryModule) AddDepsOnPythonLauncherAndStdlib(ctx android.Botto // GenerateAndroidBuildActions performs build actions common to all Python modules func (p *PythonLibraryModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { expandedSrcs := android.PathsForModuleSrcExcludes(ctx, p.properties.Srcs, p.properties.Exclude_srcs) + android.SetProvider(ctx, blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: expandedSrcs.Strings()}) // expand data files from "data" property. expandedData := android.PathsForModuleSrc(ctx, p.properties.Data) |