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 /src | |
| 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 'src')
4 files changed, 0 insertions, 8 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 527fecc01e..a7913e7acc 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -205,7 +205,6 @@ public final class BazelAnalysisMock extends AnalysisMock { " adb = ':static_adb_tool',", " aidl = ':static_aidl_tool',", " android_jar = ':android_runtime_jar',", - " annotations_jar = ':annotations_jar',", " apksigner = ':ApkSignerBinary',", " dx = ':dx_binary',", " framework_aidl = ':aidl_framework',", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index b7736ae11f..49da7c32cd 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -2439,7 +2439,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " adb = 'adb',", " aidl = 'aidl',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -2477,7 +2476,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " adb = 'adb',", " aidl = 'aidl',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -3345,7 +3343,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " adb = 'adb',", " aidl = 'aidl',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index bb1163d80e..929013e090 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -588,7 +588,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " aidl = 'aidl',", " aidl_lib = ':aidl_lib',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -1378,7 +1377,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " adb = 'adb',", " aidl = 'aidl',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -1463,7 +1461,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " adb = 'adb',", " aidl = 'aidl',", " android_jar = 'android.jar',", - " annotations_jar = 'annotations_jar',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java index 884f191612..6cd3cdea0d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSdkTest.java @@ -36,7 +36,6 @@ public class AndroidSdkTest extends BuildViewTestCase { " framework_aidl = 'framework_aidl',", " android_jar = 'android.jar',", " source_properties = 'platforms/android-25/source.properties',", - " annotations_jar = 'annotations.jar',", " apksigner = 'apksigner',", " dx = 'dx',", " main_dex_classes = 'mainDexClasses.rules',", |