diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/touch_to_fill | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/touch_to_fill')
| -rw-r--r-- | chromium/chrome/browser/touch_to_fill/android/BUILD.gn | 16 | ||||
| -rw-r--r-- | chromium/chrome/browser/touch_to_fill/android/internal/BUILD.gn | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/chromium/chrome/browser/touch_to_fill/android/BUILD.gn b/chromium/chrome/browser/touch_to_fill/android/BUILD.gn index de15117cc14..9231bf842ab 100644 --- a/chromium/chrome/browser/touch_to_fill/android/BUILD.gn +++ b/chromium/chrome/browser/touch_to_fill/android/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//build/config/android/rules.gni") -import("//chrome/android/features/android_library_factory_tmpl.gni") source_set("android") { visibility = [ "//chrome/browser/touch_to_fill:factory" ] @@ -28,9 +27,6 @@ generate_jni("jni_headers") { android_library("public_java") { deps = [ - # TODO(crbug.com/1004415): Remove dependency on chrome_java and depend on - # bottomsheet directly. Add public_java to chrome_java target instead. - "//chrome/android:chrome_java", "//components/browser_ui/android/bottomsheet:java", "//ui/android:ui_java", ] @@ -47,13 +43,22 @@ junit_binary("touch_to_fill_junit_tests") { sources = [ "junit/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillControllerTest.java" ] deps = [ + "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", + "//chrome/android:chrome_java", "//chrome/android:chrome_test_util_java", + "//chrome/browser/touch_to_fill/android:public_java", "//chrome/browser/touch_to_fill/android/internal:java", + "//chrome/browser/ui/android/favicon:java", + "//chrome/test/android:chrome_java_test_support", + "//components/browser_ui/android/bottomsheet:java", "//components/module_installer/android:module_installer_java", + "//components/url_formatter/android:url_formatter_java", + "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/mockito:mockito_java", + "//ui/android:ui_full_java", ] } @@ -75,9 +80,10 @@ android_library("test_java") { "//chrome/browser/touch_to_fill/android/internal:java", "//chrome/test/android:chrome_java_test_support", "//components/browser_ui/android/bottomsheet:java", + "//components/browser_ui/android/bottomsheet/test:java", "//content/public/test/android:content_java_test_support", "//third_party/android_deps:androidx_recyclerview_recyclerview_java", - "//third_party/espresso:espresso_all_java", + "//third_party/android_deps:espresso_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit", "//third_party/mockito:mockito_java", diff --git a/chromium/chrome/browser/touch_to_fill/android/internal/BUILD.gn b/chromium/chrome/browser/touch_to_fill/android/internal/BUILD.gn index 28683e96f91..66dfa82cb62 100644 --- a/chromium/chrome/browser/touch_to_fill/android/internal/BUILD.gn +++ b/chromium/chrome/browser/touch_to_fill/android/internal/BUILD.gn @@ -17,6 +17,7 @@ android_library("java") { "//chrome/browser/touch_to_fill/android:public_java", "//chrome/browser/ui/android/favicon:java", "//chrome/browser/util:java", + "//components/browser_ui/android/bottomsheet:java", "//components/embedder_support/android:util_java", "//components/url_formatter/android:url_formatter_java", "//third_party/android_deps:androidx_recyclerview_recyclerview_java", |