Skip to content

Commit bc36153

Browse files
ted-xiecopybara-github
authored andcommitted
Merge #293 by ted-xie: Fix broken integration tests
Closes #293 COPYBARA_INTEGRATE_REVIEW=#293 from ted-xie:fix_tests db9e607 PiperOrigin-RevId: 704439885 Change-Id: I8adf1f8fd51c889416d0ce5c8731583de436d7f2
1 parent c4661d2 commit bc36153

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ remote_android_extensions = use_extension("//bzlmod_extensions:android_extension
142142
use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
143143

144144
# integration test setup
145+
bazel_dep(
146+
name = "rules_cc",
147+
version = "0.0.16",
148+
dev_dependency = True,
149+
)
145150
bazel_dep(
146151
name = "rules_bazel_integration_test",
147152
version = "0.27.0",

test/rules/android_binary/BUILD

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ genrule(
5252
cc_library(
5353
name = "native_lib",
5454
srcs = ["native.cc"],
55-
toolchains = [
56-
":fake_arm64-v8a_toolchain",
57-
":fake_armeabi-v7a_toolchain",
55+
target_compatible_with = [
56+
# Somehow this doesn't work with MacOS.
57+
# The functionality tested by this library/descendants is
58+
# OS-agnostic and occurs at the rule level.
59+
"@platforms//os:linux",
5860
],
5961
)
6062

@@ -93,7 +95,6 @@ android_library(
9395
name = "basiclib_with_native_dep",
9496
srcs = [
9597
"java/com/foo/AJavaClass.java",
96-
"java/com/foo/AndroidManifest.xml",
9798
],
9899
deps = [":native_lib"],
99100
)

0 commit comments

Comments
 (0)