Android: Add missing dependencies in android_deps
- Update license URLs in ChromiumDepGraph.groovy
- Create directory for custom licenses:
//third_party/android_deps/licenses/
- Set correct LICENSE for com_google_android_play_core
- Add correct version of dagger's cipd.yml (2.17)
- Split out javax.inject from dagger in build.gradle
- Add quotes around cipd.yaml description to avoid interpreting : as a
mapping
Run:
rm -rf third_party/android_deps/libs/[!O]*
tools/android/roll/android_deps/fetch_all.py --update-all
New Libraries (Dependencies that were previously missed):
- com_google_code_findbugs_jsr305
- com_google_errorprone_error_prone_annotations
- com_google_j2objc_j2objc_annotations
- org_checkerframework_checker_compat_qual
- org_codehaus_mojo_animal_sniffer_annotations
Bug: 881001
Change-Id: I32467644f3d4b0899d31e97826ba5b2d019aa3dc
Reviewed-on: https://chromium-review.googlesource.com/1208462
Commit-Queue: Peter Wen <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Reviewed-by: agrieve <[email protected]>
Cr-Commit-Position: refs/heads/master@{#590790}diff --git a/DEPS b/DEPS
index 1411ee79..db3cea8 100644
--- a/DEPS
+++ b/DEPS
@@ -1652,6 +1652,17 @@
'dep_type': 'cipd',
},
+ 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305',
+ 'version': 'version:1.3.9-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
'src/third_party/android_deps/libs/com_google_dagger_dagger': {
'packages': [
{
@@ -1686,15 +1697,26 @@
},
'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
- 'version': 'version:2.17-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
+ 'version': 'version:2.17-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
+ 'version': 'version:2.1.3-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': {
'packages': [
@@ -1722,7 +1744,18 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava',
- 'version': 'version:25.0-cr0',
+ 'version': 'version:25.0-jre-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations',
+ 'version': 'version:1.1-cr0',
},
],
'condition': 'checkout_android',
@@ -1752,15 +1785,37 @@
},
'src/third_party/android_deps/libs/javax_inject_javax_inject': {
- 'packages': [
- {
- 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
- 'version': 'version:1-cr0',
- },
- ],
- 'condition': 'checkout_android',
- 'dep_type': 'cipd',
- },
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
+ 'version': 'version:1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual',
+ 'version': 'version:2.3.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations',
+ 'version': 'version:1.14-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
# === ANDROID_DEPS Generated Code End ===
}
