Have python_*{,_host} handle arch-variants
Bug: 196081778 Test: TestPython*{,Host}ArchVariance Test: go test Test: mixed_{libc,droid}.sh Change-Id: I89304e58f5bacd61534732bade4ad6bb5f2671c0
This commit is contained in:
parent
1b5262bd69
commit
19d399d4c5
@@ -63,6 +63,7 @@ func PythonBinaryBp2Build(ctx android.TopDownMutatorContext) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(b/182306917): this doesn't fully handle all nested props versioned
|
||||
// by the python version, which would have been handled by the version split
|
||||
// mutator. This is sufficient for very simple python_binary_host modules
|
||||
@@ -80,15 +81,12 @@ 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)
|
||||
deps := android.BazelLabelForModuleDeps(ctx, m.properties.Libs)
|
||||
|
||||
baseAttrs := m.makeArchVariantBaseAttributes(ctx)
|
||||
attrs := &bazelPythonBinaryAttributes{
|
||||
Main: main,
|
||||
Srcs: bazel.MakeLabelListAttribute(srcs),
|
||||
Data: bazel.MakeLabelListAttribute(data),
|
||||
Deps: bazel.MakeLabelListAttribute(deps),
|
||||
Srcs: baseAttrs.Srcs,
|
||||
Data: baseAttrs.Data,
|
||||
Deps: baseAttrs.Deps,
|
||||
Python_version: python_version,
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user