diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/third_party/robolectric | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/robolectric')
3 files changed, 26 insertions, 2 deletions
diff --git a/chromium/third_party/robolectric/BUILD.gn b/chromium/third_party/robolectric/BUILD.gn index 530637fe92a..e6db50c9630 100644 --- a/chromium/third_party/robolectric/BUILD.gn +++ b/chromium/third_party/robolectric/BUILD.gn @@ -720,7 +720,7 @@ java_library("shadows_multidex_java") { ":robolectric_utils_java", ":shadows_core_java", "//build/android:sun_tools_java", - "//third_party/android_tools:android_support_multidex_java", + "//third_party/android_deps:android_support_multidex_java", "//third_party/gson:gson_java", "//third_party/guava:guava_java", ] @@ -755,7 +755,7 @@ java_library("shadows_play_services_java") { "$google_play_services_package:google_play_services_auth_base_java", "$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_basement_java", - "//third_party/android_tools:android_support_v4_java", + "//third_party/android_deps:android_support_v4_java", "//third_party/gson:gson_java", "//third_party/guava:guava_java", ] diff --git a/chromium/third_party/robolectric/custom_asynctask/DEPS b/chromium/third_party/robolectric/custom_asynctask/DEPS new file mode 100644 index 00000000000..d0afbc25d33 --- /dev/null +++ b/chromium/third_party/robolectric/custom_asynctask/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+base/test/android/junit/src/org/chromium/base/task/test", + "+base/android/java/src/org/chromium/base/task", +] diff --git a/chromium/third_party/robolectric/local/robolectric/src/main/java/org/robolectric/internal/dependency/MavenDependencyResolver.java b/chromium/third_party/robolectric/local/robolectric/src/main/java/org/robolectric/internal/dependency/MavenDependencyResolver.java new file mode 100644 index 00000000000..4eb9ddca64f --- /dev/null +++ b/chromium/third_party/robolectric/local/robolectric/src/main/java/org/robolectric/internal/dependency/MavenDependencyResolver.java @@ -0,0 +1,20 @@ +package org.robolectric.internal.dependency; + +import java.net.URL; + +/** + * Stub implementation of MavenDependencyResolver. + * + * This class is not used by Robolectric in Chromium. Compiling against a stub implementation + * allows us to avoid needing to have some various Maven third-party libraries. + */ +public class MavenDependencyResolver implements DependencyResolver { + public MavenDependencyResolver() {} + + public MavenDependencyResolver(String repositoryUrl, String repositoryId) {} + + @Override + public URL getLocalArtifactUrl(DependencyJar dependency) { + return null; + } +} |