Skip to content

Commit c04558f

Browse files
ahumeskycopybara-github
authored andcommitted
Remove target_compatible_with from the Android toolchain generated in (Starlark) android_sdk_repository so that it can be selected along with a host JDK in android_local_test.
bazelbuild/bazel#19829 PiperOrigin-RevId: 582777002 Change-Id: If480dce6c4d35e40934fe326c1362c8f446ff848
1 parent d23c54a commit c04558f

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ rules: &rules
5353
- "//rules/..."
5454
test_targets:
5555
- "//test/rules/..."
56-
# TODO(https://github.com/bazelbuild/rules_android/issues/169):
57-
# Re-enable when these are less fragile.
58-
- "-//test/rules/android_local_test/..."
5956
# TODO(#171): Fix use of lxml in enforce_min_sdk_floor
6057
- "-//test/rules/android_binary_internal/r8_integration/..."
6158
build_flags:

rules/android_sdk_repository/helper.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ def create_android_sdk_rules(
237237
native.toolchain(
238238
name = "sdk-%d-toolchain" % api_level,
239239
exec_compatible_with = HOST_CONSTRAINTS,
240-
target_compatible_with = [
241-
"@platforms//os:android",
242-
],
243240
toolchain = ":sdk-%d" % api_level,
244241
toolchain_type = "@bazel_tools//tools/android:sdk_toolchain_type",
245242
target_settings = [

0 commit comments

Comments
 (0)