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 ===
}
diff --git a/third_party/PRESUBMIT.py b/third_party/PRESUBMIT.py
index c5773b3..f3db8291 100644
--- a/third_party/PRESUBMIT.py
+++ b/third_party/PRESUBMIT.py
@@ -7,7 +7,7 @@
'Android Software Development Kit License',
'Apache( Version)? 2(\.0)?',
'(New )?([23]-Clause )?BSD( [23]-Clause)?( with advertising clause)?',
- 'L?GPL ?v?2(\.[01])?( or later)?',
+ 'L?GPL ?v?2(\.[01])?( or later)?( with the classpath exception)?',
'MIT(/X11)?(-like)?',
'MPL 1\.1 ?/ ?GPL 2(\.0)? ?/ ?LGPL 2\.1',
'MPL 2(\.0)?',
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
index a76a17c..bfdd42b3 100644
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
@@ -565,6 +565,12 @@
]
}
+java_prebuilt("javax_inject_javax_inject_java") {
+ jar_path = "libs/javax_inject_javax_inject/javax.inject-1.jar"
+ output_name = "javax_inject_javax_inject"
+ supports_android = true
+}
+
java_prebuilt("android_arch_core_common_java") {
jar_path = "libs/android_arch_core_common/common-1.0.0.jar"
output_name = "android_arch_core_common"
@@ -730,6 +736,12 @@
]
}
+java_prebuilt("com_google_code_findbugs_jsr305_java") {
+ jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-1.3.9.jar"
+ output_name = "com_google_code_findbugs_jsr305"
+ visibility = [ ":*" ]
+}
+
java_prebuilt("com_google_dagger_dagger_producers_java") {
jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.17.jar"
output_name = "com_google_dagger_dagger_producers"
@@ -738,6 +750,7 @@
":com_google_dagger_dagger_java",
":com_google_guava_guava_java",
":javax_inject_javax_inject_java",
+ ":org_checkerframework_checker_compat_qual_java",
]
}
@@ -753,6 +766,12 @@
]
}
+java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
+ jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.1.3.jar"
+ output_name = "com_google_errorprone_error_prone_annotations"
+ visibility = [ ":*" ]
+}
+
java_prebuilt("com_google_errorprone_javac_shaded_java") {
jar_path =
"libs/com_google_errorprone_javac_shaded/javac-shaded-9-dev-r4023-3.jar"
@@ -771,9 +790,23 @@
}
java_prebuilt("com_google_guava_guava_java") {
- jar_path = "libs/com_google_guava_guava/guava-25.0.jar"
+ jar_path = "libs/com_google_guava_guava/guava-25.0-jre.jar"
output_name = "com_google_guava_guava"
visibility = [ ":*" ]
+ deps = [
+ ":com_google_code_findbugs_jsr305_java",
+ ":com_google_errorprone_error_prone_annotations_java",
+ ":com_google_j2objc_j2objc_annotations_java",
+ ":org_checkerframework_checker_compat_qual_java",
+ ":org_codehaus_mojo_animal_sniffer_annotations_java",
+ ]
+}
+
+java_prebuilt("com_google_j2objc_j2objc_annotations_java") {
+ jar_path =
+ "libs/com_google_j2objc_j2objc_annotations/j2objc-annotations-1.1.jar"
+ output_name = "com_google_j2objc_j2objc_annotations"
+ visibility = [ ":*" ]
}
java_prebuilt("com_squareup_javapoet_java") {
@@ -788,9 +821,15 @@
visibility = [ ":*" ]
}
-java_prebuilt("javax_inject_javax_inject_java") {
- jar_path = "libs/javax_inject_javax_inject/javax.inject-1.jar"
- output_name = "javax_inject_javax_inject"
- supports_android = true
+java_prebuilt("org_checkerframework_checker_compat_qual_java") {
+ jar_path = "libs/org_checkerframework_checker_compat_qual/checker-compat-qual-2.3.0.jar"
+ output_name = "org_checkerframework_checker_compat_qual"
+ visibility = [ ":*" ]
+}
+
+java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
+ jar_path = "libs/org_codehaus_mojo_animal_sniffer_annotations/animal-sniffer-annotations-1.14.jar"
+ output_name = "org_codehaus_mojo_animal_sniffer_annotations"
+ visibility = [ ":*" ]
}
# === Generated Code End ===
diff --git a/third_party/android_deps/additional_readme_paths.json b/third_party/android_deps/additional_readme_paths.json
index 496c1b1a..99c7d330 100644
--- a/third_party/android_deps/additional_readme_paths.json
+++ b/third_party/android_deps/additional_readme_paths.json
@@ -46,14 +46,19 @@
"libs/com_google_android_gms_play_services_vision",
"libs/com_google_android_gms_play_services_vision_common",
"libs/com_google_android_play_core",
+ "libs/com_google_code_findbugs_jsr305",
"libs/com_google_dagger_dagger",
"libs/com_google_dagger_dagger_compiler",
"libs/com_google_dagger_dagger_producers",
"libs/com_google_dagger_dagger_spi",
+ "libs/com_google_errorprone_error_prone_annotations",
"libs/com_google_errorprone_javac_shaded",
"libs/com_google_googlejavaformat_google_java_format",
"libs/com_google_guava_guava",
+ "libs/com_google_j2objc_j2objc_annotations",
"libs/com_squareup_javapoet",
"libs/javax_annotation_jsr250_api",
- "libs/javax_inject_javax_inject"
+ "libs/javax_inject_javax_inject",
+ "libs/org_checkerframework_checker_compat_qual",
+ "libs/org_codehaus_mojo_animal_sniffer_annotations"
]
diff --git a/third_party/android_deps/libs/android_arch_core_common/cipd.yaml b/third_party/android_deps/libs/android_arch_core_common/cipd.yaml
index ac5c8bb8..265ca55 100644
--- a/third_party/android_deps/libs/android_arch_core_common/cipd.yaml
+++ b/third_party/android_deps/libs/android_arch_core_common/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
package: chromium/third_party/android_deps/libs/android_arch_core_common
-description: Android Arch-Common
+description: "Android Arch-Common"
data:
- file: common-1.0.0.jar
diff --git a/third_party/android_deps/libs/android_arch_lifecycle_common/cipd.yaml b/third_party/android_deps/libs/android_arch_lifecycle_common/cipd.yaml
index 0a25b201..3eb9d7ea 100644
--- a/third_party/android_deps/libs/android_arch_lifecycle_common/cipd.yaml
+++ b/third_party/android_deps/libs/android_arch_lifecycle_common/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
package: chromium/third_party/android_deps/libs/android_arch_lifecycle_common
-description: Android Lifecycle-Common
+description: "Android Lifecycle-Common"
data:
- file: common-1.0.0.jar
diff --git a/third_party/android_deps/libs/android_arch_lifecycle_runtime/cipd.yaml b/third_party/android_deps/libs/android_arch_lifecycle_runtime/cipd.yaml
index ecd9a6a5..4aa3b10 100644
--- a/third_party/android_deps/libs/android_arch_lifecycle_runtime/cipd.yaml
+++ b/third_party/android_deps/libs/android_arch_lifecycle_runtime/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
package: chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime
-description: Android Lifecycle Runtime
+description: "Android Lifecycle Runtime"
data:
- file: runtime-1.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_animated_vector_drawable/cipd.yaml b/third_party/android_deps/libs/com_android_support_animated_vector_drawable/cipd.yaml
index 4e9678d..652e316 100644
--- a/third_party/android_deps/libs/com_android_support_animated_vector_drawable/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_animated_vector_drawable/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable
-description: Android Support AnimatedVectorDrawable
+description: "Android Support AnimatedVectorDrawable"
data:
- file: animated-vector-drawable-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_appcompat_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_appcompat_v7/cipd.yaml
index 46f75c4..f85a169 100644
--- a/third_party/android_deps/libs/com_android_support_appcompat_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_appcompat_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_appcompat_v7
-description: Android AppCompat Library v7
+description: "Android AppCompat Library v7"
data:
- file: appcompat-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_cardview_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_cardview_v7/cipd.yaml
index 98c9bdb..a2c7cce 100644
--- a/third_party/android_deps/libs/com_android_support_cardview_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_cardview_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_cardview_v7
-description: Android Support CardView v7
+description: "Android Support CardView v7"
data:
- file: cardview-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_design/cipd.yaml b/third_party/android_deps/libs/com_android_support_design/cipd.yaml
index 255e245d..0f80ad5 100644
--- a/third_party/android_deps/libs/com_android_support_design/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_design/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_design
-description: Android Design Support Library
+description: "Android Design Support Library"
data:
- file: design-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_gridlayout_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_gridlayout_v7/cipd.yaml
index 9da5681d..987ac58c 100644
--- a/third_party/android_deps/libs/com_android_support_gridlayout_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_gridlayout_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_gridlayout_v7
-description: Android Support Grid Layout
+description: "Android Support Grid Layout"
data:
- file: gridlayout-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_leanback_v17/cipd.yaml b/third_party/android_deps/libs/com_android_support_leanback_v17/cipd.yaml
index 1b5fe75..878a8bd0 100644
--- a/third_party/android_deps/libs/com_android_support_leanback_v17/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_leanback_v17/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_leanback_v17
-description: Android Support Leanback v17
+description: "Android Support Leanback v17"
data:
- file: leanback-v17-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_mediarouter_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_mediarouter_v7/cipd.yaml
index 676e1c3..d938c29 100644
--- a/third_party/android_deps/libs/com_android_support_mediarouter_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_mediarouter_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_mediarouter_v7
-description: Android MediaRouter Support Library
+description: "Android MediaRouter Support Library"
data:
- file: mediarouter-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_multidex/cipd.yaml b/third_party/android_deps/libs/com_android_support_multidex/cipd.yaml
index fbcde3fab..e6a4599 100644
--- a/third_party/android_deps/libs/com_android_support_multidex/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_multidex/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_multidex
-description: Android Multi-Dex Library
+description: "Android Multi-Dex Library"
data:
- file: multidex-1.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_palette_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_palette_v7/cipd.yaml
index 4ea30594..97ca1741 100644
--- a/third_party/android_deps/libs/com_android_support_palette_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_palette_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_palette_v7
-description: Android Support Palette v7
+description: "Android Support Palette v7"
data:
- file: palette-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_preference_leanback_v17/cipd.yaml b/third_party/android_deps/libs/com_android_support_preference_leanback_v17/cipd.yaml
index 745c284a..d40a052 100644
--- a/third_party/android_deps/libs/com_android_support_preference_leanback_v17/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_preference_leanback_v17/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_preference_leanback_v17
-description: Android Support Leanback Preference v17
+description: "Android Support Leanback Preference v17"
data:
- file: preference-leanback-v17-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_preference_v14/cipd.yaml b/third_party/android_deps/libs/com_android_support_preference_v14/cipd.yaml
index a58e678..f7fe88a 100644
--- a/third_party/android_deps/libs/com_android_support_preference_v14/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_preference_v14/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_preference_v14
-description: Android Support Preference v14
+description: "Android Support Preference v14"
data:
- file: preference-v14-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_preference_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_preference_v7/cipd.yaml
index 263ae7f6..31912a9 100644
--- a/third_party/android_deps/libs/com_android_support_preference_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_preference_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_preference_v7
-description: Android Support Preference v7
+description: "Android Support Preference v7"
data:
- file: preference-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_recyclerview_v7/cipd.yaml b/third_party/android_deps/libs/com_android_support_recyclerview_v7/cipd.yaml
index d56caee..2c4afa1 100644
--- a/third_party/android_deps/libs/com_android_support_recyclerview_v7/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_recyclerview_v7/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7
-description: Android Support RecyclerView v7
+description: "Android Support RecyclerView v7"
data:
- file: recyclerview-v7-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_annotations/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_annotations/cipd.yaml
index ccf0bf4d..bf084b4 100644
--- a/third_party/android_deps/libs/com_android_support_support_annotations/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_annotations/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_annotations
-description: Android Support Library Annotations
+description: "Android Support Library Annotations"
data:
- file: support-annotations-27.0.0.jar
diff --git a/third_party/android_deps/libs/com_android_support_support_compat/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_compat/cipd.yaml
index 59f6160..5dba900 100644
--- a/third_party/android_deps/libs/com_android_support_support_compat/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_compat/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_compat
-description: Android Support Library compat
+description: "Android Support Library compat"
data:
- file: support-compat-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_core_ui/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_core_ui/cipd.yaml
index f536650..0323d64 100644
--- a/third_party/android_deps/libs/com_android_support_support_core_ui/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_core_ui/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_core_ui
-description: Android Support Library core UI
+description: "Android Support Library core UI"
data:
- file: support-core-ui-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_core_utils/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_core_utils/cipd.yaml
index 70f0f1cd..8349b89 100644
--- a/third_party/android_deps/libs/com_android_support_support_core_utils/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_core_utils/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_core_utils
-description: Android Support Library core utils
+description: "Android Support Library core utils"
data:
- file: support-core-utils-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_fragment/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_fragment/cipd.yaml
index 1b682ea9..17d16d5 100644
--- a/third_party/android_deps/libs/com_android_support_support_fragment/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_fragment/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_fragment
-description: Android Support Library fragment
+description: "Android Support Library fragment"
data:
- file: support-fragment-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_media_compat/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_media_compat/cipd.yaml
index 30f4e342..00ded13 100644
--- a/third_party/android_deps/libs/com_android_support_support_media_compat/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_media_compat/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_media_compat
-description: Android Support Library media compat
+description: "Android Support Library media compat"
data:
- file: support-media-compat-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_v13/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_v13/cipd.yaml
index 18ab29f..a7e1c3f 100644
--- a/third_party/android_deps/libs/com_android_support_support_v13/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_v13/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_v13
-description: Android Support Library v13
+description: "Android Support Library v13"
data:
- file: support-v13-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_v4/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_v4/cipd.yaml
index e856a58ff..7e52146 100644
--- a/third_party/android_deps/libs/com_android_support_support_v4/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_v4/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_v4
-description: Android Support Library v4
+description: "Android Support Library v4"
data:
- file: support-v4-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_support_vector_drawable/cipd.yaml b/third_party/android_deps/libs/com_android_support_support_vector_drawable/cipd.yaml
index 3a568ee..4a8f163 100644
--- a/third_party/android_deps/libs/com_android_support_support_vector_drawable/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_support_vector_drawable/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable
-description: Android Support VectorDrawable
+description: "Android Support VectorDrawable"
data:
- file: support-vector-drawable-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_android_support_transition/cipd.yaml b/third_party/android_deps/libs/com_android_support_transition/cipd.yaml
index 09fd0e8a..8e488481 100644
--- a/third_party/android_deps/libs/com_android_support_transition/cipd.yaml
+++ b/third_party/android_deps/libs/com_android_support_transition/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:27.0.0-cr0
package: chromium/third_party/android_deps/libs/com_android_support_transition
-description: Android Transition Support Library
+description: "Android Transition Support Library"
data:
- file: transition-27.0.0.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_auth/cipd.yaml
index 76e505b2..07d9e69 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth
-description: play-services-auth
+description: "play-services-auth"
data:
- file: play-services-auth-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/cipd.yaml
index 85141cc..9b72ac9 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone
-description: play-services-auth-api-phone
+description: "play-services-auth-api-phone"
data:
- file: play-services-auth-api-phone-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/cipd.yaml
index daa8273e..c7f2c94 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base
-description: play-services-auth-base
+description: "play-services-auth-base"
data:
- file: play-services-auth-base-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_base/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_base/cipd.yaml
index 42d0ceb7..8f9540fa 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_base/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_base/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base
-description: play-services-base
+description: "play-services-base"
data:
- file: play-services-base-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_basement/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_basement/cipd.yaml
index 643dd771..dc240a65 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_basement/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_basement/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement
-description: play-services-basement
+description: "play-services-basement"
data:
- file: play-services-basement-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_cast/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_cast/cipd.yaml
index 6cfab4f..8e32d54 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_cast/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_cast/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:16.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast
-description: play-services-cast
+description: "play-services-cast"
data:
- file: play-services-cast-16.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/cipd.yaml
index d987898..f2e7d5e 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:16.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework
-description: play-services-cast-framework
+description: "play-services-cast-framework"
data:
- file: play-services-cast-framework-16.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/cipd.yaml
index 8485d71..fa5c2f8e 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut
-description: play-services-clearcut
+description: "play-services-clearcut"
data:
- file: play-services-clearcut-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_fido/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_fido/cipd.yaml
index 9038051a..81dfde67 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_fido/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_fido/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido
-description: play-services-fido
+description: "play-services-fido"
data:
- file: play-services-fido-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_flags/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_flags/cipd.yaml
index bdf568a..1d36647 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_flags/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_flags/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_flags
-description: play-services-flags
+description: "play-services-flags"
data:
- file: play-services-flags-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/cipd.yaml
index 5421833..6cae4ef 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm
-description: play-services-gcm
+description: "play-services-gcm"
data:
- file: play-services-gcm-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_iid/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_iid/cipd.yaml
index 410ebd2..833cba36 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_iid/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_iid/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid
-description: play-services-iid
+description: "play-services-iid"
data:
- file: play-services-iid-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/cipd.yaml
index f386443..9a0ef3d 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:16.0.0-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps
-description: play-services-instantapps
+description: "play-services-instantapps"
data:
- file: play-services-instantapps-16.0.0.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_location/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_location/cipd.yaml
index 3517ff4..0d1b5e0 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_location/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_location/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location
-description: play-services-location
+description: "play-services-location"
data:
- file: play-services-location-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/cipd.yaml
index eb9ebf2..60d702d0 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype
-description: play-services-phenotype
+description: "play-services-phenotype"
data:
- file: play-services-phenotype-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/cipd.yaml
index 0b42b376..13f7be0 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_places_placereport
-description: play-services-places-placereport
+description: "play-services-places-placereport"
data:
- file: play-services-places-placereport-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_stats/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_stats/cipd.yaml
index 96fc9b5..cff73b65 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_stats/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_stats/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_stats
-description: play-services-stats
+description: "play-services-stats"
data:
- file: play-services-stats-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/cipd.yaml
index 7bba4b8b..2e05fa8a 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks
-description: play-services-tasks
+description: "play-services-tasks"
data:
- file: play-services-tasks-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_vision/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_vision/cipd.yaml
index 88f715f..24aadbc 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_vision/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_vision/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision
-description: play-services-vision
+description: "play-services-vision"
data:
- file: play-services-vision-15.0.1.aar
diff --git a/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/cipd.yaml b/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/cipd.yaml
index 2d7fbf8..51856b42 100644
--- a/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:15.0.1-cr0
package: chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common
-description: play-services-vision-common
+description: "play-services-vision-common"
data:
- file: play-services-vision-common-15.0.1.aar
diff --git a/third_party/android_deps/Android_SDK_License-December_9_2016.txt b/third_party/android_deps/libs/com_google_android_play_core/LICENSE
similarity index 100%
copy from third_party/android_deps/Android_SDK_License-December_9_2016.txt
copy to third_party/android_deps/libs/com_google_android_play_core/LICENSE
diff --git a/third_party/android_deps/libs/com_google_android_play_core/README.chromium b/third_party/android_deps/libs/com_google_android_play_core/README.chromium
index db38ef1..1ff27de 100644
--- a/third_party/android_deps/libs/com_google_android_play_core/README.chromium
+++ b/third_party/android_deps/libs/com_google_android_play_core/README.chromium
@@ -1,9 +1,9 @@
-Name: Google Android Play Core
+Name:
Short Name: core
-URL: https://developer.android.com/guide/app-bundle/playcore
+URL: https://developers.google.com/android/guides/setup
Version: 1.3.0
License: Android Software Development Kit License
-License File: /third_party/android_deps/Android_SDK_License-December_9_2016.txt
+License File: LICENSE
Security Critical: yes
Description:
diff --git a/third_party/android_deps/libs/com_google_android_play_core/cipd.yaml b/third_party/android_deps/libs/com_google_android_play_core/cipd.yaml
index bea7177ac..2800ffe4 100644
--- a/third_party/android_deps/libs/com_google_android_play_core/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_android_play_core/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.3.0-cr0
package: chromium/third_party/android_deps/libs/com_google_android_play_core
-description: Google Android Play Core
+description: ""
data:
- file: core-1.3.0.aar
diff --git a/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/third_party/android_deps/libs/com_google_code_findbugs_jsr305/OWNERS b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_code_findbugs_jsr305/README.chromium b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/README.chromium
new file mode 100644
index 0000000..31c6d59d
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/README.chromium
@@ -0,0 +1,13 @@
+Name: FindBugs-jsr305
+Short Name: jsr305
+URL: http://findbugs.sourceforge.net/
+Version: 1.3.9
+License: Apache Version 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+JSR305 Annotations for Findbugs
+
+Local Modifications:
+No modifications.
diff --git a/third_party/android_deps/libs/com_google_code_findbugs_jsr305/cipd.yaml b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/cipd.yaml
new file mode 100644
index 0000000..c8bf5b5
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_code_findbugs_jsr305/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.3.9-cr0
+package: chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305
+description: "FindBugs-jsr305"
+data:
+- file: jsr305-1.3.9.jar
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger/OWNERS b/third_party/android_deps/libs/com_google_dagger_dagger/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_dagger_dagger/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml b/third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml
index 2aae831..55f9baa6 100644
--- a/third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.13-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.17-cr0
package: chromium/third_party/android_deps/libs/com_google_dagger_dagger
-description: Dagger
+description: "Dagger"
data:
- file: dagger-2.17.jar
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_compiler/OWNERS b/third_party/android_deps/libs/com_google_dagger_dagger_compiler/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_compiler/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_compiler/cipd.yaml b/third_party/android_deps/libs/com_google_dagger_dagger_compiler/cipd.yaml
index 424ce95b..bb892ae 100644
--- a/third_party/android_deps/libs/com_google_dagger_dagger_compiler/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_compiler/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.13-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.17-cr0
package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler
-description: Dagger Compiler
+description: "Dagger Compiler"
data:
- file: dagger-compiler-2.17.jar
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_producers/OWNERS b/third_party/android_deps/libs/com_google_dagger_dagger_producers/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_producers/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_producers/cipd.yaml b/third_party/android_deps/libs/com_google_dagger_dagger_producers/cipd.yaml
index f839855..15b2d0e 100644
--- a/third_party/android_deps/libs/com_google_dagger_dagger_producers/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_producers/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.13-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.17-cr0
package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers
-description: Dagger Producers
+description: "Dagger Producers"
data:
- file: dagger-producers-2.17.jar
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_spi/OWNERS b/third_party/android_deps/libs/com_google_dagger_dagger_spi/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_spi/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium b/third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium
index a3776d9..4aaef27 100644
--- a/third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium
@@ -1,4 +1,4 @@
-Name: Dagger Spi
+Name: Dagger SPI
Short Name: dagger-spi
URL: https://github.com/google/dagger
Version: 2.17
diff --git a/third_party/android_deps/libs/com_google_dagger_dagger_spi/cipd.yaml b/third_party/android_deps/libs/com_google_dagger_dagger_spi/cipd.yaml
index 46c68ad..8ec7c8e9 100644
--- a/third_party/android_deps/libs/com_google_dagger_dagger_spi/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_dagger_dagger_spi/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:2.13-cr0
+# cipd create --pkg-def cipd.yaml -tag version:2.17-cr0
package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi
-description: A fast dependency injector for Android and Java
+description: "Dagger SPI"
data:
- file: dagger-spi-2.17.jar
diff --git a/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/OWNERS b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium
new file mode 100644
index 0000000..911ffc0
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium
@@ -0,0 +1,13 @@
+Name: error-prone annotations
+Short Name: error_prone_annotations
+URL:
+Version: 2.1.3
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+
+
+Local Modifications:
+No modifications.
diff --git a/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/cipd.yaml b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/cipd.yaml
new file mode 100644
index 0000000..12ee717
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:2.1.3-cr0
+package: chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations
+description: "error-prone annotations"
+data:
+- file: error_prone_annotations-2.1.3.jar
diff --git a/third_party/android_deps/libs/com_google_errorprone_javac_shaded/LICENSE b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/LICENSE
index c322c37..0f5e3d3 100644
--- a/third_party/android_deps/libs/com_google_errorprone_javac_shaded/LICENSE
+++ b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/LICENSE
@@ -353,10 +353,8 @@
</div><div id="sidebar"><div id="openjdk-sidebar-logo"><a href="/"><img alt="OpenJDK logo" src="../images/openjdk-small.png" /></a></div><div class="links"><div class="links"><a href="/workshop"><b>Workshop</b></a></div></div><div class="links"><div class="link"><a href="/faq/">OpenJDK FAQ</a></div><div class="link"><a href="/install/">Installing</a></div><div class="link"><a href="/contribute/">Contributing</a></div><div class="link"><a href="/sponsor/">Sponsoring</a></div><div class="link"><a href="/guide/">Developers' Guide</a></div></div><div class="links"><div class="links"><a href="http://mail.openjdk.java.net">Mailing lists</a></div><div class="link"><a href="/irc">IRC</a>
· <a href="http://wiki.openjdk.java.net">Wiki</a></div></div><div class="links"><div class="links"><a href="/bylaws">Bylaws</a> · <a href="/census">Census</a></div><div class="link"><a href="/legal/">Legal</a></div></div><div class="links"><div class="links"><a href="/jeps/0"><b>JEP Process</b></a></div></div><div class="links"><div class="link search"><form method="get" action="http://www.google.com/search"><input id="searchBox" style="color: gray" type="text" name="q" size="10" maxlength="255" value="search" /><input type="hidden" name="sitesearch" value="openjdk.java.net" /></form></div></div><div class="links"><div class="about">Source code</div><div class="link"><a href="http://hg.openjdk.java.net">Mercurial</a></div><div class="link">Bundles (<a href="http://download.java.net/openjdk/jdk6">6</a>)</div></div><div class="links"><div class="about">Groups</div><div class="link"><a href="/groups/">(overview)</a></div><div class="link"><a href="/groups/2d">2D Graphics</a></div><div class="link"><a href="/groups/adoption">Adoption</a></div><div class="link"><a href="/groups/awt">AWT</a></div><div class="link"><a href="/groups/build">Build</a></div><div class="link"><a href="/groups/csr">Compatibility & Specification Review</a></div><div class="link"><a href="/groups/compiler">Compiler</a></div><div class="link"><a href="/groups/conformance">Conformance</a></div><div class="link"><a href="/groups/core-libs">Core Libraries</a></div><div class="link"><a href="/groups/gb">Governing Board</a></div><div class="link"><a href="/groups/hotspot">HotSpot</a></div><div class="link"><a href="/groups/i18n">Internationalization</a></div><div class="link"><a href="/groups/jmx">JMX</a></div><div class="link"><a href="/groups/members">Members</a></div><div class="link"><a href="/groups/net">Networking</a></div><div class="link"><a href="/groups/nb-projects">NetBeans Projects</a></div><div class="link"><a href="/groups/porters">Porters</a></div><div class="link"><a href="/groups/quality">Quality</a></div><div class="link"><a href="/groups/security">Security</a></div><div class="link"><a href="/groups/serviceability">Serviceability</a></div><div class="link"><a href="/groups/sound">Sound</a></div><div class="link"><a href="/groups/swing">Swing</a></div><div class="link"><a href="/groups/vulnerability">Vulnerability</a></div><div class="link"><a href="/groups/web">Web</a></div></div><div class="links"><div class="about">Projects</div><div class="link"><a href="/projects/">(overview)</a></div><div class="link"><a href="/projects/amber">Amber</a></div><div class="link"><a href="/projects/anno-pipeline">Annotations Pipeline 2.0</a></div><div class="link"><a href="/projects/audio-engine">Audio Engine</a></div><div class="link"><a href="/projects/build-infra">Build Infrastructure</a></div><div class="link"><a href="/projects/caciocavallo">Caciocavallo</a></div><div class="link"><a href="/projects/closures">Closures</a></div><div class="link"><a href="/projects/code-tools">Code Tools</a></div><div class="link"><a href="/projects/coin">Coin</a></div><div class="link"><a href="/projects/cvmi">Common VM Interface</a></div><div class="link"><a href="/projects/compiler-grammar">Compiler Grammar</a></div><div class="link"><a href="/projects/detroit">Detroit</a></div><div class="link"><a href="/projects/dio">Device I/O</a></div><div class="link"><a href="/projects/duke">Duke</a></div><div class="link"><a href="/projects/font-scaler">Font Scaler</a></div><div class="link"><a href="/projects/fbtoolkit">Framebuffer Toolkit</a></div><div class="link"><a href="/projects/graal">Graal</a></div><div class="link"><a href="/projects/graphics-rasterizer">Graphics Rasterizer</a></div><div class="link"><a href="/projects/harfbuzz">HarfBuzz Integration</a></div><div class="link"><a href="/projects/icedtea">IcedTea</a></div><div class="link"><a href="/projects/jdk6">JDK 6</a></div><div class="link"><a href="/projects/jdk7">JDK 7</a></div><div class="link"><a href="/projects/jdk7u">JDK 7 Updates</a></div><div class="link"><a href="/projects/jdk8">JDK 8</a></div><div class="link"><a href="/projects/jdk8u">JDK 8 Updates</a></div><div class="link"><a href="/projects/jdk9">JDK 9</a></div><div class="link"><a href="/projects/jdk">JDK</a>
(<a href="/projects/jdk/10">10</a>,
- <a href="/projects/jdk/11">11</a>)</div><div class="link"><a href="/projects/jdk-updates">JDK Updates</a></div><div class="link"><a href="/projects/javadoc-next">JavaDoc.Next</a></div><div class="link"><a href="/projects/jigsaw">Jigsaw</a></div><div class="link"><a href="/projects/kona">Kona</a></div><div class="link"><a href="/projects/kulla">Kulla</a></div><div class="link"><a href="/projects/lambda">Lambda</a></div><div class="link"><a href="/projects/locale-enhancement">Locale Enhancement</a></div><div class="link"><a href="/projects/loom">Loom</a></div><div class="link"><a href="/projects/jmm">Memory Model Update</a></div><div class="link"><a href="/projects/metropolis">Metropolis</a></div><div class="link"><a href="/projects/jmc">Mission Control</a></div><div class="link"><a href="/projects/mobile">Mobile</a></div><div class="link"><a href="/projects/modules">Modules</a></div><div class="link"><a href="/projects/mlvm">Multi-Language VM</a></div><div class="link"><a href="/projects/nashorn">Nashorn</a></div><div class="link"><a href="/projects/nio">New I/O</a></div><div class="link"><a href="/projects/openjfx">OpenJFX</a></div><div class="link"><a href="/projects/panama">Panama</a></div><div class="link"><a href="/projects/penrose">Penrose</a></div><div class="link"><a href="/projects/aarch32-port">Port: AArch32</a></div><div class="link"><a href="/projects/aarch64-port">Port: AArch64</a></div><div class="link"><a href="/projects/bsd-port">Port: BSD</a></div><div class="link"><a href="/projects/haiku-port">Port: Haiku</a></div><div class="link"><a href="/projects/macosx-port">Port: Mac OS X</a></div><div class="link"><a href="/projects/mips-port">Port: MIPS</a></div><div class="link"><a href="/projects/ppc-aix-port">Port: PowerPC/AIX</a></div><div class="link"><a href="/projects/s390x-port">Port: s390x</a></div><div class="link"><a href="/projects/portola">Portola</a></div><div class="link"><a href="/projects/sctp">SCTP</a></div><div class="link"><a href="/projects/shenandoah">Shenandoah</a></div><div class="link"><a href="/projects/sumatra">Sumatra</a></div><div class="link"><a href="/projects/threeten">ThreeTen</a></div><div class="link"><a href="/projects/tiered-attrib">Tiered Attribution</a></div><div class="link"><a href="/projects/type-annotations">Type Annotations</a></div><div class="link"><a href="/projects/xrender">XRender Pipeline</a></div><div class="link"><a href="/projects/valhalla">Valhalla</a></div><div class="link"><a href="/projects/verona">Verona</a></div><div class="link"><a href="/projects/visualvm">VisualVM</a></div><div class="link"><a href="/projects/zero">Zero</a></div><div class="link"><a href="/projects/zgc">ZGC</a></div></div><div class="links"><div class="about">Tools</div><div class="link"><a href="http://java.sun.com/javase/downloads/index.jsp">Java SE</a></div><div class="link"><a href="http://www.selenic.com/mercurial/">Mercurial</a></div><div class="link"><a href="http://netbeans.org">NetBeans</a></div><div class="link"><a href="/jtreg/index.html">jtreg harness</a></div></div><div class="links"><div class="about">Community</div><div class="link"><a href="http://planetjdk.org">Planet JDK blogs</a></div><div class="link"><a href="http://blogs.oracle.com/theaquarium">The Aquarium</a></div><div class="link"><a href="http://java.sun.com">java.sun.com</a></div><div class="link"><a href="http://jcp.org">Java Community Process</a></div></div><div class="links"><div class="about">Related</div><div class="link">JDK Snapshots (<a href="http://jdk.java.net/8/">8u</a>,
- <a href="http://jdk.java.net/9/">9</a>,
- <a href="http://jdk.java.net/10/">10</a>,
- <a href="http://jdk.java.net/11/">11</a>) </div><div class="link"><a href="http://javaee.github.io/glassfish/">GlassFish</a></div></div><div class="buttons"><a href="http://oracle.com"><img alt="Oracle logo" src="../images/oracle.png" /></a></div></div><div id="footer">
+ <a href="/projects/jdk/11">11</a>,
+ <a href="/projects/jdk/12">12</a>)</div><div class="link"><a href="/projects/jdk-updates">JDK Updates</a></div><div class="link"><a href="/projects/javadoc-next">JavaDoc.Next</a></div><div class="link"><a href="/projects/jigsaw">Jigsaw</a></div><div class="link"><a href="/projects/kona">Kona</a></div><div class="link"><a href="/projects/kulla">Kulla</a></div><div class="link"><a href="/projects/lambda">Lambda</a></div><div class="link"><a href="/projects/locale-enhancement">Locale Enhancement</a></div><div class="link"><a href="/projects/loom">Loom</a></div><div class="link"><a href="/projects/jmm">Memory Model Update</a></div><div class="link"><a href="/projects/metropolis">Metropolis</a></div><div class="link"><a href="/projects/jmc">Mission Control</a></div><div class="link"><a href="/projects/mobile">Mobile</a></div><div class="link"><a href="/projects/modules">Modules</a></div><div class="link"><a href="/projects/mlvm">Multi-Language VM</a></div><div class="link"><a href="/projects/nashorn">Nashorn</a></div><div class="link"><a href="/projects/nio">New I/O</a></div><div class="link"><a href="/projects/openjfx">OpenJFX</a></div><div class="link"><a href="/projects/panama">Panama</a></div><div class="link"><a href="/projects/penrose">Penrose</a></div><div class="link"><a href="/projects/aarch32-port">Port: AArch32</a></div><div class="link"><a href="/projects/aarch64-port">Port: AArch64</a></div><div class="link"><a href="/projects/bsd-port">Port: BSD</a></div><div class="link"><a href="/projects/haiku-port">Port: Haiku</a></div><div class="link"><a href="/projects/macosx-port">Port: Mac OS X</a></div><div class="link"><a href="/projects/mips-port">Port: MIPS</a></div><div class="link"><a href="/projects/ppc-aix-port">Port: PowerPC/AIX</a></div><div class="link"><a href="/projects/s390x-port">Port: s390x</a></div><div class="link"><a href="/projects/portola">Portola</a></div><div class="link"><a href="/projects/sctp">SCTP</a></div><div class="link"><a href="/projects/shenandoah">Shenandoah</a></div><div class="link"><a href="/projects/sumatra">Sumatra</a></div><div class="link"><a href="/projects/threeten">ThreeTen</a></div><div class="link"><a href="/projects/tiered-attrib">Tiered Attribution</a></div><div class="link"><a href="/projects/type-annotations">Type Annotations</a></div><div class="link"><a href="/projects/xrender">XRender Pipeline</a></div><div class="link"><a href="/projects/valhalla">Valhalla</a></div><div class="link"><a href="/projects/verona">Verona</a></div><div class="link"><a href="/projects/visualvm">VisualVM</a></div><div class="link"><a href="/projects/zero">Zero</a></div><div class="link"><a href="/projects/zgc">ZGC</a></div></div><div class="links"><div class="about">Tools</div><div class="link"><a href="http://java.sun.com/javase/downloads/index.jsp">Java SE</a></div><div class="link"><a href="http://mercurial-scm.org/mercurial/">Mercurial</a></div><div class="link"><a href="/jtreg/index.html">jtreg harness</a></div></div><div class="links"><div class="about">Related</div><div class="link"><a href="http://planetjdk.org">Planet JDK</a></div><div class="link"><a href="http://java.sun.com">java.sun.com</a></div><div class="link"><a href="http://jcp.org">Java Community Process</a></div><div class="link"><a href="http://jdk.java.net">JDK GA/EA Builds</a></div></div><div class="buttons"><a href="http://oracle.com"><img alt="Oracle logo" src="../images/oracle.png" /></a></div></div><div id="footer">
© 2018 Oracle Corporation and/or its affiliates
<br /><a href="/legal/tou/">Terms of Use</a>
diff --git a/third_party/android_deps/libs/com_google_errorprone_javac_shaded/OWNERS b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_errorprone_javac_shaded/cipd.yaml b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/cipd.yaml
index 3bb6714..520cf3f2 100644
--- a/third_party/android_deps/libs/com_google_errorprone_javac_shaded/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_errorprone_javac_shaded/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:9-dev-r4023-3-cr0
package: chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded
-description: Error Prone shaded javac
+description: "Error Prone shaded javac"
data:
- file: javac-shaded-9-dev-r4023-3.jar
diff --git a/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/OWNERS b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/README.chromium b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/README.chromium
index e57749b..c6e3385 100644
--- a/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/README.chromium
+++ b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/README.chromium
@@ -1,7 +1,7 @@
Name: Google Java Format
Short Name: google-java-format
URL: https://github.com/google/google-java-format
-Version: 1.4
+Version: 1.5
License: Apache 2.0
License File: NOT_SHIPPED
Security Critical: no
diff --git a/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/cipd.yaml b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/cipd.yaml
index 78fba15..5b533c5 100644
--- a/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.4-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.5-cr0
package: chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format
-description: Google Java Format
+description: "Google Java Format"
data:
- file: google-java-format-1.5.jar
diff --git a/third_party/android_deps/libs/com_google_guava_guava/OWNERS b/third_party/android_deps/libs/com_google_guava_guava/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_guava_guava/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_guava_guava/README.chromium b/third_party/android_deps/libs/com_google_guava_guava/README.chromium
index 679b657..735052e 100644
--- a/third_party/android_deps/libs/com_google_guava_guava/README.chromium
+++ b/third_party/android_deps/libs/com_google_guava_guava/README.chromium
@@ -1,13 +1,13 @@
Name: Guava: Google Core Libraries for Java
Short Name: guava
URL: https://github.com/google/guava
-Version: 25.0
+Version: 25.0-jre
License: Apache 2.0
License File: NOT_SHIPPED
Security Critical: no
Description:
-Guava is a suite of core and expanded libraries that include utility classes, google's collections, io classes, and much much more. Guava has only one code dependency - javax.annotation, per the JSR-305 spec.
+Guava is a suite of core and expanded libraries that include utility classes, google's collections, io classes, and much much more.
Local Modifications:
No modifications.
diff --git a/third_party/android_deps/libs/com_google_guava_guava/cipd.yaml b/third_party/android_deps/libs/com_google_guava_guava/cipd.yaml
index d486e1d..deccb9d 100644
--- a/third_party/android_deps/libs/com_google_guava_guava/cipd.yaml
+++ b/third_party/android_deps/libs/com_google_guava_guava/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:21.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:25.0-jre-cr0
package: chromium/third_party/android_deps/libs/com_google_guava_guava
-description: Guava, Google Core Libraries for Java
+description: "Guava: Google Core Libraries for Java"
data:
-- file: guava-25.0.jar
+- file: guava-25.0-jre.jar
diff --git a/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/OWNERS b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/README.chromium b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/README.chromium
new file mode 100644
index 0000000..426fc24
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/README.chromium
@@ -0,0 +1,13 @@
+Name: J2ObjC Annotations
+Short Name: j2objc-annotations
+URL: https://github.com/google/j2objc/
+Version: 1.1
+License: Apache Version 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A set of annotations that provide additional information to the J2ObjC translator to modify the result of translation.
+
+Local Modifications:
+No modifications.
diff --git a/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/cipd.yaml b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/cipd.yaml
new file mode 100644
index 0000000..fea1c80
--- /dev/null
+++ b/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.1-cr0
+package: chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations
+description: "J2ObjC Annotations"
+data:
+- file: j2objc-annotations-1.1.jar
diff --git a/third_party/android_deps/libs/com_squareup_javapoet/OWNERS b/third_party/android_deps/libs/com_squareup_javapoet/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/com_squareup_javapoet/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/com_squareup_javapoet/cipd.yaml b/third_party/android_deps/libs/com_squareup_javapoet/cipd.yaml
index aae1d38..7249fde8 100644
--- a/third_party/android_deps/libs/com_squareup_javapoet/cipd.yaml
+++ b/third_party/android_deps/libs/com_squareup_javapoet/cipd.yaml
@@ -3,8 +3,8 @@
# found in the LICENSE file.
# To create CIPD package run the following command.
-# cipd create --pkg-def cipd.yaml -tag version:1.8.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.11.0-cr0
package: chromium/third_party/android_deps/libs/com_squareup_javapoet
-description: JavaPoet
+description: "JavaPoet"
data:
- file: javapoet-1.11.0.jar
diff --git a/third_party/android_deps/libs/javax_annotation_jsr250_api/OWNERS b/third_party/android_deps/libs/javax_annotation_jsr250_api/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/javax_annotation_jsr250_api/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/javax_annotation_jsr250_api/cipd.yaml b/third_party/android_deps/libs/javax_annotation_jsr250_api/cipd.yaml
index 2fc6ac6b..d01fd79 100644
--- a/third_party/android_deps/libs/javax_annotation_jsr250_api/cipd.yaml
+++ b/third_party/android_deps/libs/javax_annotation_jsr250_api/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0-cr0
package: chromium/third_party/android_deps/libs/javax_annotation_jsr250_api
-description: JSR-250 Common Annotations for the JavaTM Platform
+description: "JSR-250 Common Annotations for the JavaTM Platform"
data:
- file: jsr250-api-1.0.jar
diff --git a/third_party/android_deps/libs/javax_inject_javax_inject/OWNERS b/third_party/android_deps/libs/javax_inject_javax_inject/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/javax_inject_javax_inject/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/javax_inject_javax_inject/cipd.yaml b/third_party/android_deps/libs/javax_inject_javax_inject/cipd.yaml
index 8b0b186..c25927a 100644
--- a/third_party/android_deps/libs/javax_inject_javax_inject/cipd.yaml
+++ b/third_party/android_deps/libs/javax_inject_javax_inject/cipd.yaml
@@ -5,6 +5,6 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1-cr0
package: chromium/third_party/android_deps/libs/javax_inject_javax_inject
-description: javax.inject
+description: "javax.inject"
data:
- file: javax.inject-1.jar
diff --git a/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE
new file mode 100644
index 0000000..40cdc59
--- /dev/null
+++ b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE
@@ -0,0 +1,409 @@
+Most of the Checker Framework is licensed under the GNU General Public
+License, version 2 (GPL2), with the classpath exception. The text of this
+license appears below. This is the same license used for OpenJDK.
+
+A few parts of the Checker Framework have more permissive licenses.
+
+ * The annotations are licensed under the MIT License. (The text of this
+ license appears below.) More specifically, all the parts of the Checker
+ Framework that you might want to include with your own program use the
+ MIT License. This is the checker-qual.jar file and all the files that
+ appear in it: every file in a qual/ directory, plus utility files such
+ as NullnessUtil.java, RegexUtil.java, SignednessUtil.java, etc.
+ In addition, the cleanroom implementations of third-party annotations,
+ which the Checker Framework recognizes as aliases for its own
+ annotations, are licensed under the MIT License.
+
+Some external libraries that are included with the Checker Framework have
+different licenses.
+
+ * javaparser is dual licensed under the LGPL or the Apache license -- you
+ may use it under whichever one you want. (The javaparser source code
+ contains a file with the text of the GPL, but it is not clear why, since
+ javaparser does not use the GPL.) See file stubparser/LICENSE
+ and the source code of all its files.
+
+ * JUnit is licensed under the Common Public License v1.0 (see
+ http://www.junit.org/license), with parts (Hamcrest) licensed under the
+ BSD License (see http://hamcrest.org/JavaHamcrest/).
+
+ * Libraries in plume-lib (https://github.com/plume-lib/) are licensed
+ under the MIT License.
+
+The Checker Framework includes annotations for the JDK in directory
+checker/jdk/, and for some other libraries. Each annotated library uses
+the same license as the unannotated version of the library.
+
+===========================================================================
+
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it. By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users. This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it. (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must
+make sure that they, too, receive or can get the source code. And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License. The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language. (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating
+ that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or
+ in part contains or is derived from the Program or any part thereof, to be
+ licensed as a whole at no charge to all third parties under the terms of
+ this License.
+
+ c) If the modified program normally reads commands interactively when run,
+ you must cause it, when started running for such interactive use in the
+ most ordinary way, to print or display an announcement including an
+ appropriate copyright notice and a notice that there is no warranty (or
+ else, saying that you provide a warranty) and that users may redistribute
+ the program under these conditions, and telling the user how to view a copy
+ of this License. (Exception: if the Program itself is interactive but does
+ not normally print such an announcement, your work based on the Program is
+ not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works. But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source
+ code, which must be distributed under the terms of Sections 1 and 2 above
+ on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to
+ give any third party, for a charge no more than your cost of physically
+ performing source distribution, a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of Sections 1
+ and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to
+ distribute corresponding source code. (This alternative is allowed only
+ for noncommercial distribution and only if you received the program in
+ object code or executable form with such an offer, in accord with
+ Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it. For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable. However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License. However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works. These actions are prohibited by law if you do not
+accept this License. Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein. You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time. Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+ One line to give the program's name and a brief idea of what it does.
+
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc., 59
+ Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+ with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free
+ software, and you are welcome to redistribute it under certain conditions;
+ type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary. Here
+is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ 'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ signature of Ty Coon, 1 April 1989
+
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+ Linking this library statically or dynamically with other modules is making
+ a combined work based on this library. Thus, the terms and conditions of
+ the GNU General Public License cover the whole combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules,
+ and to copy and distribute the resulting executable under terms of your
+ choice, provided that you also meet, for each linked independent module,
+ the terms and conditions of the license of that module. An independent
+ module is a module which is not derived from or based on this library. If
+ you modify this library, you may extend this exception to your version of
+ the library, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
+
+===========================================================================
+
+MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===========================================================================
diff --git a/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/OWNERS b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/README.chromium b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/README.chromium
new file mode 100644
index 0000000..07680fa8
--- /dev/null
+++ b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/README.chromium
@@ -0,0 +1,13 @@
+Name: Checker Qual
+Short Name: checker-compat-qual
+URL: https://checkerframework.org
+Version: 2.3.0
+License: GPL v2 with the classpath exception
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Checker Qual is the set of annotations (qualifiers) and supporting classes used by the Checker Framework to type check Java source code. Please see artifact: org.checkerframework:checker
+
+Local Modifications:
+No modifications.
diff --git a/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/cipd.yaml b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/cipd.yaml
new file mode 100644
index 0000000..42d1521
--- /dev/null
+++ b/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:2.3.0-cr0
+package: chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual
+description: "Checker Qual"
+data:
+- file: checker-compat-qual-2.3.0.jar
diff --git a/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE
new file mode 100644
index 0000000..370fb55
--- /dev/null
+++ b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009 codehaus.org.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/OWNERS b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/OWNERS
new file mode 100644
index 0000000..7b571d97
--- /dev/null
+++ b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/OWNERS
@@ -0,0 +1 @@
+file://third_party/android_deps/OWNERS
\ No newline at end of file
diff --git a/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/README.chromium b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/README.chromium
new file mode 100644
index 0000000..63ff8e3
--- /dev/null
+++ b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/README.chromium
@@ -0,0 +1,13 @@
+Name: Animal Sniffer Annotations
+Short Name: animal-sniffer-annotations
+URL: http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/
+Version: 1.14
+License: MIT
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+
+
+Local Modifications:
+No modifications.
diff --git a/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/cipd.yaml b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/cipd.yaml
new file mode 100644
index 0000000..7d7cf97
--- /dev/null
+++ b/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/cipd.yaml
@@ -0,0 +1,10 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.14-cr0
+package: chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations
+description: "Animal Sniffer Annotations"
+data:
+- file: animal-sniffer-annotations-1.14.jar
diff --git a/third_party/android_deps/Android_SDK_License-December_9_2016.txt b/third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt
similarity index 100%
rename from third_party/android_deps/Android_SDK_License-December_9_2016.txt
rename to third_party/android_deps/licenses/Android_SDK_License-December_9_2016.txt
diff --git a/third_party/android_deps/licenses/Codehaus_License-2009.txt b/third_party/android_deps/licenses/Codehaus_License-2009.txt
new file mode 100644
index 0000000..370fb55
--- /dev/null
+++ b/third_party/android_deps/licenses/Codehaus_License-2009.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009 codehaus.org.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/tools/android/roll/android_deps/build.gradle b/tools/android/roll/android_deps/build.gradle
index db7cfb2..1b35618 100644
--- a/tools/android/roll/android_deps/build.gradle
+++ b/tools/android/roll/android_deps/build.gradle
@@ -64,11 +64,11 @@
compile "com.android.support:multidex:1.0.0"
+ compile "javax.inject:javax.inject:1"
+
// Dagger
def daggerVersion = '2.17'
compile "com.google.dagger:dagger:${daggerVersion}"
- compile "javax.inject:javax.inject:1"
-
annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
}
diff --git a/tools/android/roll/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy b/tools/android/roll/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
index 365e515..e5a2f12 100644
--- a/tools/android/roll/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
+++ b/tools/android/roll/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy
@@ -76,11 +76,11 @@
new File("${absoluteDepDir}/README.chromium").write(makeReadme(dependency))
new File("${absoluteDepDir}/cipd.yaml").write(makeCipdYaml(dependency, repositoryPath))
new File("${absoluteDepDir}/OWNERS").write(makeOwners())
- if (!dependency.licenseUrl?.trim()?.isEmpty()) {
- downloadFile(dependency.licenseUrl, new File("${absoluteDepDir}/LICENSE"))
- } else if (!dependency.licensePath?.isEmpty()) {
+ if (!dependency.licensePath?.trim()?.isEmpty()) {
new File("${absoluteDepDir}/LICENSE").write(
new File("${normalisedRepoPath}/${dependency.licensePath}").text)
+ } else if (!dependency.licenseUrl?.trim()?.isEmpty()) {
+ downloadFile(dependency.licenseUrl, new File("${absoluteDepDir}/LICENSE"))
}
}
@@ -265,7 +265,7 @@
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:${cipdVersion}
package: chromium/${repoPath}/${DOWNLOAD_DIRECTORY_NAME}/${dependency.id}
- description: ${dependency.displayName}
+ description: "${dependency.displayName}"
data:
- file: ${dependency.fileName}
""".stripIndent()
diff --git a/tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy b/tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy
index 0ca3be4a..af6e50c 100644
--- a/tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy
+++ b/tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy
@@ -21,23 +21,25 @@
final def dependencies = new HashMap<String, DependencyDescription>()
// Some libraries don't properly fill their POM with the appropriate licensing information.
- // It is provided here from manual lookups.
+ // It is provided here from manual lookups. Note that licenseUrl must provide textual content
+ // rather than be an html page.
final def FALLBACK_PROPERTIES = [
'com_google_googlejavaformat_google_java_format': new DependencyDescription(
- url: "https://github.com/google/google-java-format",
- licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
- licenseName: "Apache 2.0"),
+ url: "https://github.com/google/google-java-format",
+ licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+ licenseName: "Apache 2.0"),
'com_google_guava_guava': new DependencyDescription(
- url: "https://github.com/google/guava",
- licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
- licenseName: "Apache 2.0"),
+ url: "https://github.com/google/guava",
+ licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+ licenseName: "Apache 2.0"),
'org_codehaus_mojo_animal_sniffer_annotations': new DependencyDescription(
- url: "http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/",
- licenseUrl: "https://opensource.org/licenses/mit-license.php",
- licenseName: "MIT"),
+ url: "http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/",
+ licenseUrl: "https://raw.githubusercontent.com/mojohaus/animal-sniffer/master/animal-sniffer-annotations/pom.xml",
+ licensePath: "licenses/Codehaus_License-2009.txt",
+ licenseName: "MIT"),
'org_checkerframework_checker_compat_qual' :new DependencyDescription(
- licenseUrl: "https://github.com/typetools/checker-framework/blob/master/LICENSE.txt",
- licenseName: "GPL v2 (with the classpath exception)"),
+ licenseUrl: "https://raw.githubusercontent.com/typetools/checker-framework/master/LICENSE.txt",
+ licenseName: "GPL v2 with the classpath exception"),
]
Project project
@@ -151,24 +153,25 @@
}
private customizeDep(DependencyDescription dep) {
- if (dep.id?.startsWith("com_google_android_gms_play_services_")) {
+ if (dep.id?.startsWith("com_google_android_")) {
dep.licenseUrl = ""
// This should match fetch_all._ANDROID_SDK_LICENSE_PATH
- dep.licensePath = "Android_SDK_License-December_9_2016.txt"
+ dep.licensePath = "licenses/Android_SDK_License-December_9_2016.txt"
if (dep.url?.isEmpty()) {
dep.url = "https://developers.google.com/android/guides/setup"
}
- // Filter out targets like:
- // com_google_android_gms_play_services_auth_api_phone_license
- if (dep.id?.endsWith("_license")) {
- dep.exclude = true
- }
} else if (dep.licenseName?.isEmpty()) {
def fallbackProperties = FALLBACK_PROPERTIES.get(dep.id)
if (fallbackProperties != null) {
project.logger.debug("Using fallback properties for ${dep.id}")
dep.licenseName = fallbackProperties.licenseName
dep.licenseUrl = fallbackProperties.licenseUrl
+ if (fallbackProperties.licensePath != null) {
+ dep.licensePath = fallbackProperties.licensePath
+ }
+ if (dep.url?.isEmpty()) {
+ dep.url = fallbackProperties.url
+ }
}
}
diff --git a/tools/android/roll/android_deps/fetch_all.py b/tools/android/roll/android_deps/fetch_all.py
index 561c59a..cea4b71 100755
--- a/tools/android/roll/android_deps/fetch_all.py
+++ b/tools/android/roll/android_deps/fetch_all.py
@@ -51,9 +51,8 @@
# Path to BUILD.gn file under android_deps/
_ANDROID_DEPS_BUILD_GN = _ANDROID_DEPS_SUBDIR + '/BUILD.gn'
-# Path to updated Android SDK License under android_deps/
-_ANDROID_SDK_LICENSE_PATH = (
- _ANDROID_DEPS_SUBDIR + '/Android_SDK_License-December_9_2016.txt')
+# Path to custom licenses under android_deps/
+_ANDROID_DEPS_LICENSE_SUBDIR = _ANDROID_DEPS_SUBDIR + '/licenses'
# Path to additional_readme_paths.json
_ANDROID_DEPS_ADDITIONAL_README_PATHS = (
@@ -75,10 +74,10 @@
_ANDROID_DEPS_ADDITIONAL_README_PATHS,
]
-# The list of files that are copied to the build directory by this script.
-# Should not include _UPDATED_GIT_FILES.
+# The list of files and dirs that are copied to the build directory by this
+# script. Should not include _UPDATED_GIT_FILES.
_COPIED_PATHS = [
- _ANDROID_SDK_LICENSE_PATH,
+ _ANDROID_DEPS_LICENSE_SUBDIR,
_BUILD_GRADLE_PATH,
_GRADLE_BUILDSRC_PATH,
]
@@ -382,9 +381,9 @@
return
missing_files = []
- for src_file in _UPDATED_GIT_FILES + _COPIED_PATHS:
- if not os.path.exists(os.path.join(chromium_src, src_file)):
- missing_files.append(src_file)
+ for src_path in _UPDATED_GIT_FILES + _COPIED_PATHS:
+ if not os.path.exists(os.path.join(chromium_src, src_path)):
+ missing_files.append(src_path)
if missing_files:
raise Exception('Missing files from %s: %s' % (chromium_src, missing_files))
