Add androidx_espresso to android_deps.

Bug: 1005891,1054152
Change-Id: I28da67e1d4d1b92a4953a8ae72f9565055cc2afb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2064823Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#745168}

DEPS

@@ -1620,7 +1620,7 @@ deps = {
       'packages': [
           {
               'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation',
-              'version': 'version:1.0.0-cr0',
+              'version': 'version:1.1.0-cr0',
           },
       ],
       'condition': 'checkout_android',
@@ -2078,6 +2078,28 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/androidx_test_espresso_espresso_core': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_core',
+              'version': 'version:3.1.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource',
+              'version': 'version:3.1.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/androidx_test_ext_junit': {
       'packages': [
           {
@@ -3167,6 +3189,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/com_squareup_javawriter': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_squareup_javawriter',
+              'version': 'version:2.1.1-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/commons_cli_commons_cli': {
       'packages': [
           {

third_party/android_deps/BUILD.gn

@@ -514,7 +514,7 @@ android_aar_prebuilt("android_arch_lifecycle_viewmodel_java_orig") {
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("androidx_annotation_annotation_java") {
-  jar_path = "libs/androidx_annotation_annotation/annotation-1.0.0.jar"
+  jar_path = "libs/androidx_annotation_annotation/annotation-1.1.0.jar"
   output_name = "androidx_annotation_annotation"
   supports_android = true
   skip_jetify = true
@@ -862,6 +862,23 @@ android_aar_prebuilt("androidx_test_core_java") {
   skip_jetify = true
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_test_espresso_espresso_core_java") {
+  aar_path = "libs/androidx_test_espresso_espresso_core/espresso-core-3.1.0.aar"
+  info_path = "libs/androidx_test_espresso_espresso_core/androidx_test_espresso_espresso_core.info"
+  testonly = true
+  deps = [
+    ":androidx_test_espresso_espresso_idling_resource_java",
+    ":androidx_test_runner_java",
+    ":com_google_code_findbugs_jsr305_java",
+    ":com_squareup_javawriter_java",
+    ":javax_inject_javax_inject_java",
+    "//third_party/hamcrest:hamcrest_integration_java",
+    "//third_party/hamcrest:hamcrest_library_java",
+  ]
+  skip_jetify = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_test_ext_junit_java") {
   aar_path = "libs/androidx_test_ext_junit/junit-1.1.1.aar"
@@ -1988,6 +2005,18 @@ android_aar_prebuilt("androidx_slidingpanelayout_slidingpanelayout_java") {
   skip_jetify = true
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_test_espresso_espresso_idling_resource_java") {
+  aar_path = "libs/androidx_test_espresso_espresso_idling_resource/espresso-idling-resource-3.1.0.aar"
+  info_path = "libs/androidx_test_espresso_espresso_idling_resource/androidx_test_espresso_espresso_idling_resource.info"
+
+  # To remove visibility constraint, add this dependency to
+  # //tools/android/roll/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  testonly = true
+  skip_jetify = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_transition_transition_java") {
   aar_path = "libs/androidx_transition_transition/transition-1.0.0-rc02.aar"
@@ -2579,6 +2608,17 @@ java_prebuilt("com_google_protobuf_protobuf_java_java") {
   visibility = [ ":*" ]
 }
 
+java_prebuilt("com_squareup_javawriter_java") {
+  jar_path = "libs/com_squareup_javawriter/javawriter-2.1.1.jar"
+  output_name = "com_squareup_javawriter"
+  supports_android = true
+
+  # To remove visibility constraint, add this dependency to
+  # //tools/android/roll/android_deps/build.gradle.
+  visibility = [ ":*" ]
+  testonly = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("net_ltgt_gradle_incap_incap_java") {
   jar_path = "libs/net_ltgt_gradle_incap_incap/incap-0.2.jar"

third_party/android_deps/additional_readme_paths.json

@@ -49,6 +49,8 @@
     "libs/androidx_slidingpanelayout_slidingpanelayout",
     "libs/androidx_swiperefreshlayout_swiperefreshlayout",
     "libs/androidx_test_core",
+    "libs/androidx_test_espresso_espresso_core",
+    "libs/androidx_test_espresso_espresso_idling_resource",
     "libs/androidx_test_ext_junit",
     "libs/androidx_test_monitor",
     "libs/androidx_test_rules",
@@ -148,6 +150,7 @@
     "libs/com_google_protobuf_protobuf_lite",
     "libs/com_googlecode_java_diff_utils_diffutils",
     "libs/com_squareup_javapoet",
+    "libs/com_squareup_javawriter",
     "libs/commons_cli_commons_cli",
     "libs/javax_annotation_javax_annotation_api",
     "libs/javax_annotation_jsr250_api",

third_party/android_deps/build.gradle

@@ -150,6 +150,7 @@ dependencies {
     testCompile "androidx.test:monitor:1.2.0"
     testCompile "androidx.test:rules:1.2.0"
     testCompile "androidx.test:runner:1.2.0"
+    testCompile "androidx.test.espresso:espresso-core:3.1.0"
     testCompile "androidx.test.ext:junit:1.1.1"
     testCompile "androidx.test.uiautomator:uiautomator:2.2.0"
     testCompile "com.googlecode.java-diff-utils:diffutils:1.3.0"

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -37,6 +37,8 @@ class BuildConfigGenerator extends DefaultTask {
     private static final def EXISTING_LIBS = [
         'junit_junit': '//third_party/junit:junit',
         'org_hamcrest_hamcrest_core': '//third_party/hamcrest:hamcrest_core_java',
+        'org_hamcrest_hamcrest_integration': '//third_party/hamcrest:hamcrest_integration_java',
+        'org_hamcrest_hamcrest_library': '//third_party/hamcrest:hamcrest_library_java',
     ]
 
 

third_party/android_deps/libs/androidx_annotation_annotation/README.chromium

 Name: Android Support Library Annotations
 Short Name: annotation
 URL: http://developer.android.com/tools/extras/support-library.html
-Version: 1.0.0
+Version: 1.1.0
 License: Apache Version 2.0
 License File: LICENSE
 Security Critical: yes

third_party/android_deps/libs/androidx_annotation_annotation/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.0.0-cr0
+# cipd create --pkg-def cipd.yaml -tag version:1.1.0-cr0
 package: chromium/third_party/android_deps/libs/androidx_annotation_annotation
 description: "Android Support Library Annotations"
 data:
-- file: annotation-1.0.0.jar
+- file: annotation-1.1.0.jar

third_party/android_deps/libs/androidx_test_espresso_espresso_core/OWNERS

+file://third_party/android_deps/OWNERS

third_party/android_deps/libs/androidx_test_espresso_espresso_core/README.chromium

+Name: AndroidX Test Library
+Short Name: espresso-core
+URL: https://developer.android.com/testing
+Version: 3.1.0
+License: Apache Version 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+Description:
+The AndroidX Test Library provides an extensive framework for testing Android apps
+Local Modifications:
+No modifications.
+

third_party/android_deps/libs/androidx_test_espresso_espresso_core/androidx_test_espresso_espresso_core.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = true
+has_r_text_file = false
+is_manifest_empty = true
+resources = [  ]
+subjar_tuples = [  ]
+subjars = [  ]
+

third_party/android_deps/libs/androidx_test_espresso_espresso_core/cipd.yaml

+# 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:3.1.0-cr0
+package: chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_core
+description: "AndroidX Test Library"
+data:
+- file: espresso-core-3.1.0.aar
+

third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource/OWNERS

+file://third_party/android_deps/OWNERS

third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource/README.chromium

+Name: AndroidX Test Library
+Short Name: espresso-idling-resource
+URL: https://developer.android.com/testing
+Version: 3.1.0
+License: Apache Version 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+Description:
+The AndroidX Test Library provides an extensive framework for testing Android apps
+Local Modifications:
+No modifications.
+

third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource/androidx_test_espresso_espresso_idling_resource.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = false
+has_r_text_file = false
+is_manifest_empty = true
+resources = [  ]
+subjar_tuples = [  ]
+subjars = [  ]
+

third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource/cipd.yaml

+# 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:3.1.0-cr0
+package: chromium/third_party/android_deps/libs/androidx_test_espresso_espresso_idling_resource
+description: "AndroidX Test Library"
+data:
+- file: espresso-idling-resource-3.1.0.aar
+

third_party/android_deps/libs/com_squareup_javawriter/OWNERS

+file://third_party/android_deps/OWNERS

third_party/android_deps/libs/com_squareup_javawriter/README.chromium

+Name: JavaWriter
+Short Name: javawriter
+URL: http://github.com/square/javawriter/
+Version: 2.1.1
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+Description:
+A utility class which aids in generating Java source files.
+Local Modifications:
+No modifications.
+

third_party/android_deps/libs/com_squareup_javawriter/cipd.yaml

+# 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.1-cr0
+package: chromium/third_party/android_deps/libs/com_squareup_javawriter
+description: "JavaWriter"
+data:
+- file: javawriter-2.1.1.jar

third_party/hamcrest/BUILD.gn

@@ -19,6 +19,14 @@ java_prebuilt("hamcrest_core_java") {
   proguard_configs = [ "//third_party/hamcrest/proguard.flags" ]
 }
 
+java_prebuilt("hamcrest_integration_java") {
+  supports_android = true
+  testonly = true
+  jar_path = "lib/hamcrest-integration.jar"
+  proguard_configs = [ "//third_party/hamcrest/proguard.flags" ]
+  deps = [ ":hamcrest_library_java" ]
+}
+
 java_prebuilt("hamcrest_library_java") {
   supports_android = true
   testonly = true