Merge changes from topic "adbd_host"

* changes:
  Allowlist python dependency of adb targets
  bp2build support for host_ldlibs
This commit is contained in:
Treehugger Robot
2023-05-17 05:23:21 +00:00
committed by Gerrit Code Review
4 changed files with 62 additions and 12 deletions

View File

@@ -1266,6 +1266,9 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion
}
la.additionalLinkerInputs.SetSelectValue(axis, config, additionalLinkerInputs)
if axis == bazel.OsConfigurationAxis && (config == bazel.OsDarwin || config == bazel.OsLinux || config == bazel.OsWindows) {
linkerFlags = append(linkerFlags, props.Host_ldlibs...)
}
la.linkopts.SetSelectValue(axis, config, linkerFlags)
if axisFeatures != nil {