diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/binary.go | 7 | ||||
| -rw-r--r-- | python/library.go | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/python/binary.go b/python/binary.go index afcc53a65..bf6167c3c 100644 --- a/python/binary.go +++ b/python/binary.go @@ -37,7 +37,6 @@ func registerPythonBinaryComponents(ctx android.RegistrationContext) { type bazelPythonBinaryAttributes struct { Main string Srcs bazel.LabelListAttribute - Data bazel.LabelListAttribute Deps bazel.LabelListAttribute Python_version string } @@ -85,7 +84,6 @@ func PythonBinaryBp2Build(ctx android.TopDownMutatorContext) { attrs := &bazelPythonBinaryAttributes{ Main: main, Srcs: baseAttrs.Srcs, - Data: baseAttrs.Data, Deps: baseAttrs.Deps, Python_version: python_version, } @@ -95,7 +93,10 @@ func PythonBinaryBp2Build(ctx android.TopDownMutatorContext) { Rule_class: "py_binary", } - ctx.CreateBazelTargetModule(m.Name(), props, attrs) + ctx.CreateBazelTargetModule(props, android.CommonAttributes{ + Name: m.Name(), + Data: baseAttrs.Data, + }, attrs) } type BinaryProperties struct { diff --git a/python/library.go b/python/library.go index 19fa59a3f..d136a4efb 100644 --- a/python/library.go +++ b/python/library.go @@ -45,7 +45,6 @@ func PythonLibraryHostFactory() android.Module { type bazelPythonLibraryAttributes struct { Srcs bazel.LabelListAttribute - Data bazel.LabelListAttribute Deps bazel.LabelListAttribute Srcs_version string } @@ -91,7 +90,6 @@ func pythonLibBp2Build(ctx android.TopDownMutatorContext, modType string) { baseAttrs := m.makeArchVariantBaseAttributes(ctx) attrs := &bazelPythonLibraryAttributes{ Srcs: baseAttrs.Srcs, - Data: baseAttrs.Data, Deps: baseAttrs.Deps, Srcs_version: python_version, } @@ -101,7 +99,10 @@ func pythonLibBp2Build(ctx android.TopDownMutatorContext, modType string) { Rule_class: "py_library", } - ctx.CreateBazelTargetModule(m.Name(), props, attrs) + ctx.CreateBazelTargetModule(props, android.CommonAttributes{ + Name: m.Name(), + Data: baseAttrs.Data, + }, attrs) } func PythonLibraryFactory() android.Module { |