diff options
| author |  ajmichael <ajmichael@google.com> | 2018-01-26 08:15:33 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-26 08:17:07 -0800 |
| commit | eefdecd3044e86012c73bedc8ed6213b473802b4 (patch) | |
| tree | 211670ca0b8cbd659db61afa180b309137a87c04 /tools | |
| parent | 7278db80ca00b44fad4ee593d221f4c570d41354 (diff) | |
Stop setting annotations_jar in Bazel android_sdk.
It is optional as of https://github.com/bazelbuild/bazel/commit/1a6ca6f47aef36d56b5cb2f9da114af75dde583d.
RELNOTES: None
PiperOrigin-RevId: 183391869
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/BUILD.tools | 1 | ||||
| -rw-r--r-- | tools/android/android_sdk_repository_template.bzl | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools index 95f3ee1a88..d4cac641fe 100644 --- a/tools/android/BUILD.tools +++ b/tools/android/BUILD.tools @@ -278,7 +278,6 @@ android_sdk( aidl = ":error_message", android_jar = ":error_message.jar", shrinked_android_jar = ":error_message.jar", - annotations_jar = ":error_message.jar", main_dex_classes = ":error_message", apksigner = ":error_message", zipalign = ":error_message", diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl index 5e6a9931aa..387d01457c 100644 --- a/tools/android/android_sdk_repository_template.bzl +++ b/tools/android/android_sdk_repository_template.bzl @@ -72,7 +72,6 @@ def create_android_sdk_rules( "build-tools/%s/lib/apksigner.jar" % build_tools_directory, "build-tools/%s/lib/dx.jar" % build_tools_directory, "build-tools/%s/mainDexClasses.rules" % build_tools_directory, - "tools/support/annotations.jar", ] + [ "platforms/android-%d/%s" % (api_level, filename) for api_level in api_levels @@ -117,7 +116,6 @@ def create_android_sdk_rules( }), android_jar = "platforms/android-%d/android.jar" % api_level, shrinked_android_jar = "platforms/android-%d/android.jar" % api_level, - annotations_jar = "tools/support/annotations.jar", main_dex_classes = "build-tools/%s/mainDexClasses.rules" % build_tools_directory, apksigner = ":apksigner", zipalign = select({ |