From 0702791a99d076f79f2971ff96cf0e4eb5308319 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Mon, 15 Mar 2021 06:02:43 -0400 Subject: bp2build: arch-configurable selects for label list attrs. This CL adds the configurable LabelListAttribute support to bp2build. Test: go test Change-Id: I2ef9e385d9cf1b1845988128eca1d8cda1ecb5e8 --- python/binary.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'python/binary.go') diff --git a/python/binary.go b/python/binary.go index 5b0f080b3..e955492a6 100644 --- a/python/binary.go +++ b/python/binary.go @@ -36,8 +36,8 @@ func registerPythonBinaryComponents(ctx android.RegistrationContext) { type bazelPythonBinaryAttributes struct { Main string - Srcs bazel.LabelList - Data bazel.LabelList + Srcs bazel.LabelListAttribute + Data bazel.LabelListAttribute Python_version string } @@ -97,10 +97,13 @@ func PythonBinaryBp2Build(ctx android.TopDownMutatorContext) { // do nothing, since python_version defaults to PY3. } + srcs := android.BazelLabelForModuleSrcExcludes(ctx, m.properties.Srcs, m.properties.Exclude_srcs) + data := android.BazelLabelForModuleSrc(ctx, m.properties.Data) + attrs := &bazelPythonBinaryAttributes{ Main: main, - Srcs: android.BazelLabelForModuleSrcExcludes(ctx, m.properties.Srcs, m.properties.Exclude_srcs), - Data: android.BazelLabelForModuleSrc(ctx, m.properties.Data), + Srcs: bazel.MakeLabelListAttribute(srcs), + Data: bazel.MakeLabelListAttribute(data), Python_version: python_version, } -- cgit v1.2.3-59-g8ed1b