Skip to content

Commit

Permalink
Make desugar tests assume android-24.
Browse files Browse the repository at this point in the history
Previously, they assumed android-25 but Bazel CI does not have android-25
installed. In practice, these tests do not care which version is used so we
should use //tools/android:defaults_jar which selects the jar based on the
configuration. However, that target does not produce the jar as a runfile, it
is only useful currently for neverlink compilation.

RELNOTES: None
PiperOrigin-RevId: 169104539
  • Loading branch information
aj-michael authored and laszlocsomor committed Sep 19, 2017
1 parent bbfe088 commit 06d1988
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ filegroup(
name = "android_jar_for_testing",
srcs = select({
# TODO(ajmichael): Use //tools/defaults:android_jar here once it supplies runfiles.
"//external:has_androidsdk": ["@androidsdk//:platforms/android-25/android.jar"],
"//external:has_androidsdk": ["@androidsdk//:platforms/android-24/android.jar"],
"//conditions:default": ["@bazel_tools//tools/android:error_message.jar"],
}),
)
Expand Down

0 comments on commit 06d1988

Please sign in to comment.