[Build] Switch androidx dependencies to use //third_party/androidx
This CL switches depenendencies on the
//third_party/android_deps:androidx alias to refer to
//third_party/androidx instead.
This CL was generated via:
find . -name *.gn -exec sed -i 's/android_deps:androidx/androidx:androidx/g' {} +
BUG=1064277
Change-Id: I3238cd487298ef733939ade5edf5898dd374c5ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2693055
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#853751}
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index 6ec0bce..6d4f9a9 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -65,7 +65,7 @@
# TODO(b/165810905): Use per-feature -keep rules in R8 once supported, then
# this can be removed.
assert_no_deps =
- [ "//third_party/android_deps:androidx_recyclerview_recyclerview_java" ]
+ [ "//third_party/androidx:androidx_recyclerview_recyclerview_java" ]
}
if (enable_webview_bundles) {
@@ -552,8 +552,8 @@
"//mojo/public/java/system:system_impl_java",
"//net/android:net_java",
"//services/network/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:mojom_platform_java",
"//ui/android:ui_no_recycler_view_java",
@@ -582,8 +582,8 @@
"//android_webview/proto:aw_variations_seed_proto_java",
"//base:base_java",
"//components/variations/android:variations_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -600,7 +600,7 @@
"//base:base_java",
"//components/embedder_support/android/metrics:java",
"//content/public/android:content_full_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
# The appropriate .class file will be loaded via a dependency to a library
@@ -629,7 +629,7 @@
"//base:jni_java",
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
"//components/minidump_uploader:minidump_uploader_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
@@ -664,7 +664,7 @@
"//components/metrics:metrics_java",
"//components/viz:viz_java",
"//gpu/config:config_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/common:common_java",
"//ui/android:ui_features_java",
]
diff --git a/android_webview/glue/BUILD.gn b/android_webview/glue/BUILD.gn
index 5107ff1..81915348 100644
--- a/android_webview/glue/BUILD.gn
+++ b/android_webview/glue/BUILD.gn
@@ -24,7 +24,7 @@
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
]
diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
index 5976cf4..ceb4ca74 100644
--- a/android_webview/nonembedded/BUILD.gn
+++ b/android_webview/nonembedded/BUILD.gn
@@ -31,9 +31,9 @@
"//base:jni_java",
"//components/about_ui/android:aboutui_java",
"//components/embedder_support/android:application_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -66,13 +66,13 @@
"//base:base_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/version_info/android:version_constants_java",
- "//third_party/android_deps:androidx_activity_activity_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
- "//third_party/android_deps:androidx_savedstate_savedstate_java",
+ "//third_party/androidx:androidx_activity_activity_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
+ "//third_party/androidx:androidx_savedstate_savedstate_java",
"//ui/android:ui_no_recycler_view_java",
]
resources_package = "org.chromium.android_webview.devui"
@@ -103,9 +103,9 @@
"//components/minidump_uploader:minidump_uploader_java",
"//components/variations/android:variations_java",
"//components/version_info/android:version_constants_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/android_webview/support_library/BUILD.gn b/android_webview/support_library/BUILD.gn
index 64c737e..bfbe0bc 100644
--- a/android_webview/support_library/BUILD.gn
+++ b/android_webview/support_library/BUILD.gn
@@ -37,6 +37,6 @@
"//base:base_java",
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/android_webview/support_library/boundary_interfaces/BUILD.gn b/android_webview/support_library/boundary_interfaces/BUILD.gn
index d3c7500..3221dbc8 100644
--- a/android_webview/support_library/boundary_interfaces/BUILD.gn
+++ b/android_webview/support_library/boundary_interfaces/BUILD.gn
@@ -42,7 +42,7 @@
# build when we mirror this into AndroidX. We are only permitted to depend on
# core Android classes and other AndroidX classes (must be in the androidx.*
# package name).
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
android_apk("boundary_interface_example_apk") {
diff --git a/android_webview/support_library/callback/BUILD.gn b/android_webview/support_library/callback/BUILD.gn
index 22816f2..f7f5206e 100644
--- a/android_webview/support_library/callback/BUILD.gn
+++ b/android_webview/support_library/callback/BUILD.gn
@@ -16,6 +16,6 @@
"//android_webview:browser_java",
"//android_webview/support_library/boundary_interfaces:boundary_interface_java",
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index 58c630e..bac1053c 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -60,8 +60,8 @@
"//components/heap_profiling/multi_process:heap_profiling_java_test_support",
"//components/policy/android:policy_java_test_support",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
"//ui/android:ui_java",
"//url:gurl_java",
@@ -221,11 +221,6 @@
"//net/android:net_javatests",
"//services/device/public/java:geolocation_java",
"//services/device/public/java:geolocation_java_test_support",
- "//third_party/android_deps:androidx_activity_activity_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_guava_failureaccess_java",
"//third_party/android_deps:espresso_java",
@@ -233,6 +228,11 @@
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_activity_activity_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:web_feature_mojo_bindings_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
@@ -544,9 +544,9 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:mojom_platform_java",
]
diff --git a/android_webview/tools/automated_ui_tests/BUILD.gn b/android_webview/tools/automated_ui_tests/BUILD.gn
index 77dcf35..3120cfd 100644
--- a/android_webview/tools/automated_ui_tests/BUILD.gn
+++ b/android_webview/tools/automated_ui_tests/BUILD.gn
@@ -58,12 +58,12 @@
":webview_ui_test_app_java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
diff --git a/android_webview/tools/system_webview_shell/BUILD.gn b/android_webview/tools/system_webview_shell/BUILD.gn
index d77273c3..062a676a 100644
--- a/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/android_webview/tools/system_webview_shell/BUILD.gn
@@ -60,11 +60,11 @@
":system_webview_shell_apk_resources",
"//base:base_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_activity_activity_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_savedstate_savedstate_java",
- "//third_party/android_deps:androidx_webkit_webkit_java",
"//third_party/android_deps:guava_android_java",
+ "//third_party/androidx:androidx_activity_activity_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_savedstate_savedstate_java",
+ "//third_party/androidx:androidx_webkit_webkit_java",
]
resources_package = "org.chromium.webview_shell"
}
@@ -109,9 +109,9 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//testing/android/reporter:reporter_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
@@ -130,10 +130,10 @@
"//base:base_java",
"//base:base_java_test_support",
"//testing/android/reporter:reporter_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
data = [
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 42c91ab..0810811 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -3700,11 +3700,11 @@
deps = [
":jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_multidex_multidex_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_multidex_multidex_java",
]
sources = [
@@ -3884,11 +3884,11 @@
":base_java_test_support",
":jni_java",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_runner_java",
- "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
@@ -3943,17 +3943,17 @@
":base_java",
":jni_java",
"//testing/android/reporter:reporter_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_runner_java",
- "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_sdk:android_support_chromium_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:exposed_instrumentation_api_publish_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
@@ -4068,11 +4068,11 @@
deps = [
":base_java",
"//testing/android/junit:junit_test_support",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
]
@@ -4124,8 +4124,8 @@
":base_junit_test_support",
":jni_java",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
]
}
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index b823030..3b41061 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -488,8 +488,8 @@
"//base:base_java",
"//base:base_java_test_support",
"//testing/android/native_test:native_main_runner_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":test_support_java_aidl" ]
sources = [
diff --git a/build/config/android/test/resource_overlay/BUILD.gn b/build/config/android/test/resource_overlay/BUILD.gn
index de4f59d..4a063d2 100644
--- a/build/config/android/test/resource_overlay/BUILD.gn
+++ b/build/config/android/test/resource_overlay/BUILD.gn
@@ -53,8 +53,8 @@
":dependency_tagged_root_resources",
":root_tagged_root_resources",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 2f5ed5b..8d453858 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -933,7 +933,7 @@
srcjar_deps = [ ":cc_android_java_enums_srcjar" ]
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
}
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 95ee2be..47a68e8 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -230,10 +230,10 @@
"//content/public/android:content_java_resources",
"//third_party/android_data_chart:android_data_chart_java_resources",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_gridlayout_gridlayout_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
]
}
@@ -506,22 +506,6 @@
"//skia/public/mojom:mojom_java",
"//third_party/android_data_chart:android_data_chart_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_customview_customview_java",
- "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
- "//third_party/android_deps:androidx_interpolator_interpolator_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_viewpager2_viewpager2_java",
- "//third_party/android_deps:androidx_viewpager_viewpager_java",
"//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
@@ -532,6 +516,22 @@
"//third_party/android_media:android_media_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_customview_customview_java",
+ "//third_party/androidx:androidx_gridlayout_gridlayout_java",
+ "//third_party/androidx:androidx_interpolator_interpolator_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java8_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_viewpager2_viewpager2_java",
+ "//third_party/androidx:androidx_viewpager_viewpager_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/blink/public/mojom:mojom_platform_java",
@@ -952,14 +952,6 @@
"//services/media_session/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:chromium_play_services_availability_shadows_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
@@ -969,6 +961,14 @@
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_swiperefreshlayout_swiperefreshlayout_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/blink/public/mojom:mojom_platform_java",
@@ -1020,11 +1020,11 @@
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_media:android_media_resources",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
@@ -1268,15 +1268,6 @@
"//services/service_manager/public/java:service_manager_java",
"//third_party/android_data_chart:android_data_chart_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
- "//third_party/android_deps:androidx_viewpager2_viewpager2_java",
- "//third_party/android_deps:androidx_viewpager_viewpager_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
@@ -1288,6 +1279,15 @@
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
+ "//third_party/androidx:androidx_viewpager2_viewpager2_java",
+ "//third_party/androidx:androidx_viewpager_viewpager_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/blink/public/mojom:mojom_mhtml_load_result_java",
@@ -1390,13 +1390,13 @@
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
"//ui/android:ui_java",
@@ -2047,8 +2047,8 @@
"//components/sync/protocol:protocol_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
"//url:gurl_android_test_helper_java",
"//url:gurl_java",
@@ -2241,9 +2241,9 @@
"//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//third_party/google_android_play_core:com_google_android_play_core_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2766,8 +2766,8 @@
"//base:base_java_test_support",
"//chrome/test/android:chrome_java_test_pagecontroller",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
]
@@ -2807,8 +2807,8 @@
"//base:base_java_test_support",
"//chrome/test/android:chrome_java_test_pagecontroller",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn
index 371f3ae2..7447098 100644
--- a/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chrome/android/features/autofill_assistant/BUILD.gn
@@ -17,7 +17,7 @@
"//base:base_java",
"//chrome/android:chrome_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
]
sources = [ "java/src/org/chromium/chrome/browser/" +
@@ -63,17 +63,17 @@
"//content/public/android:content_java",
"//mojo/public/java:bindings_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_gridlayout_gridlayout_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//ui/android:ui_java",
"//url:gurl_java",
@@ -269,8 +269,8 @@
"//base:jni_java",
"//components/autofill_assistant/browser:proto_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/hamcrest:hamcrest_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -341,14 +341,14 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/gif_player:gif_player_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/android/features/cablev2_authenticator/BUILD.gn
index 4a9a54e..ee81656 100644
--- a/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -26,7 +26,7 @@
"//base:jni_java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
]
diff --git a/chrome/android/features/keyboard_accessory/BUILD.gn b/chrome/android/features/keyboard_accessory/BUILD.gn
index ff5a3c61..ae87a0a 100644
--- a/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -79,13 +79,13 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
@@ -128,9 +128,9 @@
"//components/feature_engagement/public:public_java",
"//components/module_installer/android:module_installer_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index 7575385f..675ef22e 100644
--- a/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -33,11 +33,11 @@
"//components/url_formatter/android:url_formatter_java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_viewpager_viewpager_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_viewpager_viewpager_java",
"//ui/android:ui_java",
"//ui/android:ui_utils_java",
"//url:gurl_java",
diff --git a/chrome/android/features/keyboard_accessory/public/BUILD.gn b/chrome/android/features/keyboard_accessory/public/BUILD.gn
index 9f08197c..d76bf28 100644
--- a/chrome/android/features/keyboard_accessory/public/BUILD.gn
+++ b/chrome/android/features/keyboard_accessory/public/BUILD.gn
@@ -9,7 +9,7 @@
"//base:base_java",
"//components/autofill/android:autofill_java",
"//components/browser_ui/bottomsheet/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
]
sources = [
diff --git a/chrome/android/features/start_surface/internal/BUILD.gn b/chrome/android/features/start_surface/internal/BUILD.gn
index b4355e62..f31de7a 100644
--- a/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chrome/android/features/start_surface/internal/BUILD.gn
@@ -87,9 +87,9 @@
"//components/user_prefs/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
"//ui/android:ui_utils_java",
"//ui/base/mojom:mojom_java",
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
index fb0dbdf..168178a 100644
--- a/chrome/android/features/tab_ui/BUILD.gn
+++ b/chrome/android/features/tab_ui/BUILD.gn
@@ -231,14 +231,14 @@
"//content/public/android:content_java",
"//content/public/android:content_java_resources",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
diff --git a/chrome/android/features/vr/BUILD.gn b/chrome/android/features/vr/BUILD.gn
index 2702e04..7563d18 100644
--- a/chrome/android/features/vr/BUILD.gn
+++ b/chrome/android/features/vr/BUILD.gn
@@ -92,10 +92,10 @@
"//content/public/android:content_java",
"//device/vr:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_runtime_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
"//third_party/gvr-android-keyboard:kb_java",
"//third_party/gvr-android-sdk:gvr_common_java",
"//ui/android:ui_full_java",
diff --git a/chrome/android/modules/cablev2_authenticator/public/BUILD.gn b/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
index 0c6d5fa..1350cdf3 100644
--- a/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
+++ b/chrome/android/modules/cablev2_authenticator/public/BUILD.gn
@@ -13,7 +13,7 @@
"//components/module_installer/android:module_installer_java",
"//components/module_installer/android:module_interface_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps =
[ "//components/module_installer/android:module_interface_processor" ]
diff --git a/chrome/android/modules/image_editor/provider/BUILD.gn b/chrome/android/modules/image_editor/provider/BUILD.gn
index 88150ce7..2d0c1e92 100644
--- a/chrome/android/modules/image_editor/provider/BUILD.gn
+++ b/chrome/android/modules/image_editor/provider/BUILD.gn
@@ -10,6 +10,6 @@
deps = [
"//chrome/browser/image_editor/public:java",
"//components/module_installer/android:module_installer_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chrome/android/webapk/libs/client/BUILD.gn b/chrome/android/webapk/libs/client/BUILD.gn
index 1184019..b581b6dd 100644
--- a/chrome/android/webapk/libs/client/BUILD.gn
+++ b/chrome/android/webapk/libs/client/BUILD.gn
@@ -18,7 +18,7 @@
"//chrome/android/webapk/libs/common:common_java",
"//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
"//components/webapk/android/libs/common:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":runtime_library_version_java" ]
}
diff --git a/chrome/android/webapk/libs/common/BUILD.gn b/chrome/android/webapk/libs/common/BUILD.gn
index 47fec151..e892ff5 100644
--- a/chrome/android/webapk/libs/common/BUILD.gn
+++ b/chrome/android/webapk/libs/common/BUILD.gn
@@ -18,7 +18,7 @@
sources = [ "src/org/chromium/webapk/lib/common/splash/SplashLayout.java" ]
deps = [
":splash_resources",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
resources_package = "org.chromium.webapk.lib.common.splash"
}
diff --git a/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chrome/android/webapk/libs/runtime_library/BUILD.gn
index 71bb30ae..86f75469 100644
--- a/chrome/android/webapk/libs/runtime_library/BUILD.gn
+++ b/chrome/android/webapk/libs/runtime_library/BUILD.gn
@@ -32,7 +32,7 @@
sources =
[ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
srcjar_deps = [ ":webapk_service_aidl" ]
- deps = [ "//third_party/android_deps:androidx_core_core_java" ]
+ deps = [ "//third_party/androidx:androidx_core_core_java" ]
}
# The subset of runtime_library_from_assets_java needed for tests.
@@ -41,7 +41,7 @@
[ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
deps = [
":webapk_service_aidl_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
@@ -76,8 +76,8 @@
"//base:base_java_test_support",
"//chrome/test/android:chrome_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/chrome/android/webapk/shell_apk/BUILD.gn b/chrome/android/webapk/shell_apk/BUILD.gn
index c03e101..1b05fc5 100644
--- a/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chrome/android/webapk/shell_apk/BUILD.gn
@@ -77,7 +77,7 @@
"//chrome/android/webapk/libs/common:common_java",
"//chrome/android/webapk/libs/common:splash_java",
"//components/webapk/android/libs/common:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
}
@@ -362,8 +362,8 @@
"//base:base_java_test_support",
"//chrome/android/webapk/libs/common:common_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
srcjar_deps = [ "javatests/dex_optimizer:dex_optimizer_service_aidl" ]
@@ -387,7 +387,7 @@
"//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java",
"//chrome/android/webapk/test:junit_test_support",
"//components/webapk/android/libs/common:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chrome/browser/android/browserservices/verification/BUILD.gn b/chrome/browser/android/browserservices/verification/BUILD.gn
index 4350aa23..b456309 100644
--- a/chrome/browser/android/browserservices/verification/BUILD.gn
+++ b/chrome/browser/android/browserservices/verification/BUILD.gn
@@ -22,10 +22,10 @@
"//components/embedder_support/android:util_java",
"//components/externalauth/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:dagger_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps =
[ "//chrome/browser/installable/digital_asset_links:enums_srcjar" ]
@@ -54,8 +54,8 @@
"//components/externalauth/android:java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/chrome/browser/android/crypto/BUILD.gn b/chrome/browser/android/crypto/BUILD.gn
index 438bf6e..d62fc9d 100644
--- a/chrome/browser/android/crypto/BUILD.gn
+++ b/chrome/browser/android/crypto/BUILD.gn
@@ -8,7 +8,7 @@
deps = [
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
"java/src/org/chromium/chrome/browser/crypto/ByteArrayGenerator.java",
diff --git a/chrome/browser/android/examples/custom_tabs_client/BUILD.gn b/chrome/browser/android/examples/custom_tabs_client/BUILD.gn
index d1dfc5f..fbfcb56 100644
--- a/chrome/browser/android/examples/custom_tabs_client/BUILD.gn
+++ b/chrome/browser/android/examples/custom_tabs_client/BUILD.gn
@@ -69,9 +69,9 @@
deps = [
":chrome_tabs_client_example_apk_resources",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
]
}
diff --git a/chrome/browser/android/lifecycle/BUILD.gn b/chrome/browser/android/lifecycle/BUILD.gn
index 2a8417d..d5e330b2 100644
--- a/chrome/browser/android/lifecycle/BUILD.gn
+++ b/chrome/browser/android/lifecycle/BUILD.gn
@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
sources = [
"java/src/org/chromium/chrome/browser/lifecycle/ActivityLifecycleDispatcher.java",
"java/src/org/chromium/chrome/browser/lifecycle/ActivityResultWithNativeObserver.java",
diff --git a/chrome/browser/banners/android/BUILD.gn b/chrome/browser/banners/android/BUILD.gn
index 496a233..cdc16a5 100644
--- a/chrome/browser/banners/android/BUILD.gn
+++ b/chrome/browser/banners/android/BUILD.gn
@@ -23,7 +23,7 @@
"//components/feature_engagement/public:public_java",
"//components/webapps/browser/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
@@ -70,9 +70,9 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/browser_controls/android/BUILD.gn b/chrome/browser/browser_controls/android/BUILD.gn
index 38492768..a5be491 100644
--- a/chrome/browser/browser_controls/android/BUILD.gn
+++ b/chrome/browser/browser_controls/android/BUILD.gn
@@ -20,7 +20,7 @@
"//chrome/browser/flags:java",
"//components/browser_ui/util/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
}
diff --git a/chrome/browser/consent_auditor/android/BUILD.gn b/chrome/browser/consent_auditor/android/BUILD.gn
index 77ca70f5..7a841bcf 100644
--- a/chrome/browser/consent_auditor/android/BUILD.gn
+++ b/chrome/browser/consent_auditor/android/BUILD.gn
@@ -14,7 +14,7 @@
"//base:base_java",
"//base:jni_java",
"//chrome/browser/profiles/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ "//components/consent_auditor:consent_auditor_java" ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/chrome/browser/contextmenu/BUILD.gn b/chrome/browser/contextmenu/BUILD.gn
index a8d5cd4..c39afe7 100644
--- a/chrome/browser/contextmenu/BUILD.gn
+++ b/chrome/browser/contextmenu/BUILD.gn
@@ -26,7 +26,7 @@
"//components/browser_ui/share/android:java",
"//components/embedder_support/android:context_menu_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
]
diff --git a/chrome/browser/continuous_search/BUILD.gn b/chrome/browser/continuous_search/BUILD.gn
index ada2d278..fd06463 100644
--- a/chrome/browser/continuous_search/BUILD.gn
+++ b/chrome/browser/continuous_search/BUILD.gn
@@ -26,9 +26,9 @@
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
"//services/network/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
@@ -63,9 +63,9 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//url:gurl_java",
]
diff --git a/chrome/browser/continuous_search/internal/BUILD.gn b/chrome/browser/continuous_search/internal/BUILD.gn
index 9af3e00..284a1471 100644
--- a/chrome/browser/continuous_search/internal/BUILD.gn
+++ b/chrome/browser/continuous_search/internal/BUILD.gn
@@ -44,7 +44,7 @@
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
]
diff --git a/chrome/browser/device/BUILD.gn b/chrome/browser/device/BUILD.gn
index 22360dd..72aed64f 100644
--- a/chrome/browser/device/BUILD.gn
+++ b/chrome/browser/device/BUILD.gn
@@ -15,7 +15,7 @@
"//chrome/browser/preferences:java",
"//chrome/browser/util:java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
}
diff --git a/chrome/browser/download/android/BUILD.gn b/chrome/browser/download/android/BUILD.gn
index b29ede0..b534cf5f 100644
--- a/chrome/browser/download/android/BUILD.gn
+++ b/chrome/browser/download/android/BUILD.gn
@@ -17,8 +17,8 @@
"//base:base_java",
"//components/embedder_support/android:util_java",
"//content/public/android:content_main_dex_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
@@ -88,11 +88,11 @@
"//components/prefs/android:java",
"//components/user_prefs/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_java",
]
@@ -148,8 +148,8 @@
"//chrome/test/android:chrome_java_test_support",
"//components/browser_ui/util/android:java",
"//components/offline_items_collection/core:core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn
index c9151717..7d32fc9 100644
--- a/chrome/browser/download/internal/android/BUILD.gn
+++ b/chrome/browser/download/internal/android/BUILD.gn
@@ -121,13 +121,13 @@
"//components/prefs/android:java",
"//components/url_formatter/android:url_formatter_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_vectordrawable_vectordrawable_animated_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_vectordrawable_vectordrawable_animated_java",
"//ui/android:ui_java",
]
@@ -223,16 +223,16 @@
"//components/url_formatter/android:url_formatter_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/hamcrest:hamcrest_library_java",
"//third_party/junit",
@@ -270,8 +270,8 @@
"//components/browser_ui/util/android:java",
"//components/offline_items_collection/core:core_java",
"//components/url_formatter/android:url_formatter_java",
- "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_core_core_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_full_java",
diff --git a/chrome/browser/endpoint_fetcher/BUILD.gn b/chrome/browser/endpoint_fetcher/BUILD.gn
index 4b28139d..b7707f36 100644
--- a/chrome/browser/endpoint_fetcher/BUILD.gn
+++ b/chrome/browser/endpoint_fetcher/BUILD.gn
@@ -10,7 +10,7 @@
"//base:base_java",
"//base:jni_java",
"//chrome/browser/profiles/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
"java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java",
diff --git a/chrome/browser/engagement/android/BUILD.gn b/chrome/browser/engagement/android/BUILD.gn
index ed6f5b6..b14eeb3 100644
--- a/chrome/browser/engagement/android/BUILD.gn
+++ b/chrome/browser/engagement/android/BUILD.gn
@@ -15,7 +15,7 @@
"//chrome/browser/tab:java",
"//chrome/test/android:chrome_java_test_support",
"//components/site_engagement/content/android:java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
]
}
diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/android/BUILD.gn
index 2270b73a..b3b4628 100644
--- a/chrome/browser/feedback/android/BUILD.gn
+++ b/chrome/browser/feedback/android/BUILD.gn
@@ -56,7 +56,7 @@
"//components/variations/android:variations_java",
"//content/public/android:content_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
resources_package = "org.chromium.chrome.browser.feedback"
diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
index d032ef52..4d236e9 100644
--- a/chrome/browser/flags/BUILD.gn
+++ b/chrome/browser/flags/BUILD.gn
@@ -21,7 +21,7 @@
"//base:jni_java",
"//build:chromeos_buildflags",
"//chrome/browser/preferences:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [
":chrome_android_java_switches_srcjar",
@@ -97,9 +97,9 @@
"//base/test:test_support_java",
"//chrome/android:chrome_java",
"//chrome/test/android:chrome_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/image_descriptions/BUILD.gn b/chrome/browser/image_descriptions/BUILD.gn
index a30d3fc0..3dd3d92 100644
--- a/chrome/browser/image_descriptions/BUILD.gn
+++ b/chrome/browser/image_descriptions/BUILD.gn
@@ -27,8 +27,8 @@
"//components/user_prefs/android:java",
"//content/public/android:content_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_full_java",
]
@@ -82,9 +82,9 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/image_fetcher/BUILD.gn b/chrome/browser/image_fetcher/BUILD.gn
index 7822872..1e5b5514da 100644
--- a/chrome/browser/image_fetcher/BUILD.gn
+++ b/chrome/browser/image_fetcher/BUILD.gn
@@ -12,7 +12,7 @@
"//chrome/browser/util:java",
"//components/browser_ui/util/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/gif_player:gif_player_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/chrome/browser/incognito/interstitial/android/BUILD.gn b/chrome/browser/incognito/interstitial/android/BUILD.gn
index 34ac7eb..c37956ed 100644
--- a/chrome/browser/incognito/interstitial/android/BUILD.gn
+++ b/chrome/browser/incognito/interstitial/android/BUILD.gn
@@ -16,7 +16,7 @@
"//chrome/browser/profiles/android:java",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
@@ -54,10 +54,10 @@
"//chrome/browser/flags:java",
"//chrome/test/android:chrome_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java_test_support",
diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn
index 69f8e0d5..6200442 100644
--- a/chrome/browser/language/android/BUILD.gn
+++ b/chrome/browser/language/android/BUILD.gn
@@ -45,12 +45,12 @@
"//components/prefs/android:java",
"//components/user_prefs/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_full_java",
"//ui/android:ui_no_recycler_view_java",
]
diff --git a/chrome/browser/metrics_settings/android/BUILD.gn b/chrome/browser/metrics_settings/android/BUILD.gn
index 2548ce198..a82fffa 100644
--- a/chrome/browser/metrics_settings/android/BUILD.gn
+++ b/chrome/browser/metrics_settings/android/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
":java_resources",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
]
resources_package = "org.chromium.chrome.browser.metrics_settings"
}
diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/android/BUILD.gn
index d8e8473d..d0ab56b05 100644
--- a/chrome/browser/omaha/android/BUILD.gn
+++ b/chrome/browser/omaha/android/BUILD.gn
@@ -15,7 +15,7 @@
deps = [
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chrome/browser/optimization_guide/android/BUILD.gn b/chrome/browser/optimization_guide/android/BUILD.gn
index b626a0e..e88063a 100644
--- a/chrome/browser/optimization_guide/android/BUILD.gn
+++ b/chrome/browser/optimization_guide/android/BUILD.gn
@@ -21,8 +21,8 @@
"//chrome/browser/profiles/android:java",
"//components/optimization_guide/proto:optimization_guide_proto_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
@@ -68,8 +68,8 @@
"//chrome/test/android:chrome_java_test_support",
"//components/optimization_guide/proto:optimization_guide_proto_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//url:gurl_java",
diff --git a/chrome/browser/page_annotations/android/BUILD.gn b/chrome/browser/page_annotations/android/BUILD.gn
index c5f0942..80f93ce3 100644
--- a/chrome/browser/page_annotations/android/BUILD.gn
+++ b/chrome/browser/page_annotations/android/BUILD.gn
@@ -22,7 +22,7 @@
"//chrome/browser/endpoint_fetcher:java",
"//chrome/browser/flags:java",
"//chrome/browser/profiles/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
}
diff --git a/chrome/browser/page_annotations/test/android/BUILD.gn b/chrome/browser/page_annotations/test/android/BUILD.gn
index d9fe118..781f8e5c 100644
--- a/chrome/browser/page_annotations/test/android/BUILD.gn
+++ b/chrome/browser/page_annotations/test/android/BUILD.gn
@@ -28,9 +28,9 @@
"//chrome/browser/page_annotations/android:java",
"//chrome/browser/profiles/android:java",
"//chrome/test/android:chrome_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//url:gurl_java",
@@ -54,8 +54,8 @@
"//chrome/browser/page_annotations/android:java",
"//chrome/browser/profiles/android:java",
"//chrome/test/android:chrome_java_test_support",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//url:gurl_java",
diff --git a/chrome/browser/paint_preview/android/BUILD.gn b/chrome/browser/paint_preview/android/BUILD.gn
index 18b92f3..dc1007f 100644
--- a/chrome/browser/paint_preview/android/BUILD.gn
+++ b/chrome/browser/paint_preview/android/BUILD.gn
@@ -40,7 +40,7 @@
"//components/paint_preview/common/proto:proto_java",
"//components/paint_preview/player/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
@@ -78,10 +78,10 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//third_party/ub-uiautomator:ub_uiautomator_java",
diff --git a/chrome/browser/password_check/android/BUILD.gn b/chrome/browser/password_check/android/BUILD.gn
index 52b5cc1..5f8738dd 100644
--- a/chrome/browser/password_check/android/BUILD.gn
+++ b/chrome/browser/password_check/android/BUILD.gn
@@ -11,7 +11,7 @@
# Wrap the java_cpp_enum in android_library so it can be used by both
# chrome_java and modules.
android_library("password_check_java_enums") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":password_check_enums_srcjar" ]
}
@@ -41,12 +41,12 @@
"//chrome/browser/password_manager/android:java",
"//components/browser_ui/settings/android:java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_vectordrawable_vectordrawable_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_vectordrawable_vectordrawable_java",
]
sources = [
"java/src/org/chromium/chrome/browser/password_check/PasswordCheck.java",
@@ -90,7 +90,7 @@
"//chrome/browser/settings:java",
"//chrome/test/android:chrome_java_test_support",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//ui/android:ui_full_java",
@@ -128,15 +128,15 @@
"//components/browser_ui/widget/android:java",
"//components/embedder_support/android:util_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_sdk:android_test_base_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/password_check/android/internal/BUILD.gn b/chrome/browser/password_check/android/internal/BUILD.gn
index 02b2a55a..981594f 100644
--- a/chrome/browser/password_check/android/internal/BUILD.gn
+++ b/chrome/browser/password_check/android/internal/BUILD.gn
@@ -30,7 +30,7 @@
"//chrome/browser/flags:java",
"//chrome/browser/settings:java",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
_public_target,
]
sources = _factory_sources
@@ -44,8 +44,8 @@
"//chrome/browser/feedback/android:java",
"//chrome/browser/settings:java",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
_public_ui_target,
]
sources = _ui_factory_sources
@@ -57,7 +57,7 @@
"//chrome/browser/feedback/android:java",
"//chrome/browser/settings:java",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
_public_target,
_public_ui_target,
]
@@ -86,15 +86,15 @@
"//components/embedder_support/android:util_java",
"//components/favicon/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
_public_target,
diff --git a/chrome/browser/password_entry_edit/android/BUILD.gn b/chrome/browser/password_entry_edit/android/BUILD.gn
index 4681baf..d95177b 100644
--- a/chrome/browser/password_entry_edit/android/BUILD.gn
+++ b/chrome/browser/password_entry_edit/android/BUILD.gn
@@ -30,7 +30,7 @@
deps = [
":java_resources",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_preference_preference_java",
]
resources_package = "org.chromium.chrome.browser.password_entry_edit"
diff --git a/chrome/browser/password_entry_edit/android/internal/BUILD.gn b/chrome/browser/password_entry_edit/android/internal/BUILD.gn
index 2b66d0e..c1bb24c6 100644
--- a/chrome/browser/password_entry_edit/android/internal/BUILD.gn
+++ b/chrome/browser/password_entry_edit/android/internal/BUILD.gn
@@ -17,7 +17,7 @@
"//base:jni_java",
"//chrome/browser/password_entry_edit/android:java",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn
index acc62117..8840b60 100644
--- a/chrome/browser/password_manager/android/BUILD.gn
+++ b/chrome/browser/password_manager/android/BUILD.gn
@@ -11,8 +11,8 @@
"//chrome/browser/settings:java",
"//components/browser_ui/settings/android:java",
"//components/password_manager/core/browser:password_manager_java_enums",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//url:gurl_java",
]
sources = [
@@ -47,7 +47,7 @@
":java",
"//base:base_junit_test_support",
"//chrome/test/android:chrome_java_test_support",
- "//third_party/android_deps:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//third_party/junit",
]
}
diff --git a/chrome/browser/password_manager/android_test_helpers/BUILD.gn b/chrome/browser/password_manager/android_test_helpers/BUILD.gn
index ddce79a2..a416155 100644
--- a/chrome/browser/password_manager/android_test_helpers/BUILD.gn
+++ b/chrome/browser/password_manager/android_test_helpers/BUILD.gn
@@ -28,7 +28,7 @@
"//base:base_jni_headers",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/chrome/browser/payments/android/BUILD.gn b/chrome/browser/payments/android/BUILD.gn
index 3a23a4ff..5d6b489 100644
--- a/chrome/browser/payments/android/BUILD.gn
+++ b/chrome/browser/payments/android/BUILD.gn
@@ -34,8 +34,8 @@
"//content/public/android:content_java",
"//mojo/public/java:bindings_java",
"//mojo/public/java:system_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/mockito:mockito_java",
"//ui/android:ui_no_recycler_view_java",
diff --git a/chrome/browser/performance_hints/android/BUILD.gn b/chrome/browser/performance_hints/android/BUILD.gn
index 052bf23b..503660d 100644
--- a/chrome/browser/performance_hints/android/BUILD.gn
+++ b/chrome/browser/performance_hints/android/BUILD.gn
@@ -15,7 +15,7 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
diff --git a/chrome/browser/policy/android/BUILD.gn b/chrome/browser/policy/android/BUILD.gn
index 1b899db8..66c0776 100644
--- a/chrome/browser/policy/android/BUILD.gn
+++ b/chrome/browser/policy/android/BUILD.gn
@@ -13,7 +13,7 @@
"//base:jni_java",
"//chrome/browser/profiles/android:java",
"//components/policy/android:policy_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = _jni_sources
diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
index 7b1719e..752ed14c 100644
--- a/chrome/browser/preferences/BUILD.gn
+++ b/chrome/browser/preferences/BUILD.gn
@@ -18,7 +18,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_pref_names_srcjar" ]
@@ -64,7 +64,7 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
index 9a9f0f3..2761f82 100644
--- a/chrome/browser/privacy/BUILD.gn
+++ b/chrome/browser/privacy/BUILD.gn
@@ -32,10 +32,10 @@
"//components/browser_ui/widget/android:java",
"//components/minidump_uploader:minidump_uploader_java",
"//net/dns/public:secure_dns_mode_generated_enum",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
]
srcjar_deps = [
"//chrome/browser/net:secure_dns_management_mode_generated_enum",
diff --git a/chrome/browser/privacy_sandbox/android/BUILD.gn b/chrome/browser/privacy_sandbox/android/BUILD.gn
index f86a72c..a234127 100644
--- a/chrome/browser/privacy_sandbox/android/BUILD.gn
+++ b/chrome/browser/privacy_sandbox/android/BUILD.gn
@@ -26,8 +26,8 @@
"//chrome/browser/settings:java",
"//chrome/browser/ui/messages/android:java",
"//components/browser_ui/settings/android:java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_full_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/chrome/browser/profiles/android/BUILD.gn b/chrome/browser/profiles/android/BUILD.gn
index 09abb53..d1f63f2 100644
--- a/chrome/browser/profiles/android/BUILD.gn
+++ b/chrome/browser/profiles/android/BUILD.gn
@@ -14,7 +14,7 @@
"//chrome/browser/preferences:java",
"//components/embedder_support/android:browser_context_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = [
diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn
index a8a16a3..ec2a6b4 100644
--- a/chrome/browser/safe_browsing/android/BUILD.gn
+++ b/chrome/browser/safe_browsing/android/BUILD.gn
@@ -45,11 +45,11 @@
"//components/browser_ui/widget/android:java",
"//components/prefs/android:java",
"//components/user_prefs/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_vectordrawable_vectordrawable_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_vectordrawable_vectordrawable_java",
"//ui/android:ui_full_java",
"//ui/android:ui_no_recycler_view_java",
]
@@ -81,9 +81,9 @@
"//components/prefs/android:java",
"//components/user_prefs/android:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/safety_check/android/BUILD.gn b/chrome/browser/safety_check/android/BUILD.gn
index e3f0ab4..d96538d1 100644
--- a/chrome/browser/safety_check/android/BUILD.gn
+++ b/chrome/browser/safety_check/android/BUILD.gn
@@ -50,12 +50,12 @@
"//components/signin/public/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_livedata_core_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java8_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_livedata_core_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_full_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -80,9 +80,9 @@
"//chrome/browser/settings:test_support_java",
"//chrome/test/android:chrome_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_full_java",
diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn
index 1ecaf3ba..bc94f4d 100644
--- a/chrome/browser/settings/BUILD.gn
+++ b/chrome/browser/settings/BUILD.gn
@@ -12,7 +12,7 @@
"//components/browser_ui/settings/android:java",
"//components/prefs/android:java",
"//components/user_prefs/android:java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
]
}
@@ -35,12 +35,12 @@
"//components/browser_ui/settings/android:java",
"//content/public/test/android:content_java_test_support",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
]
@@ -58,9 +58,9 @@
"//chrome/browser/settings:java",
"//components/browser_ui/settings/android:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
]
diff --git a/chrome/browser/signin/services/android/BUILD.gn b/chrome/browser/signin/services/android/BUILD.gn
index a9d0e10..4406784 100644
--- a/chrome/browser/signin/services/android/BUILD.gn
+++ b/chrome/browser/signin/services/android/BUILD.gn
@@ -37,8 +37,8 @@
"//components/signin/core/browser:signin_enums_java",
"//components/signin/core/browser/android:java",
"//components/signin/public/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
]
srcjar_deps = [ "//chrome/browser/profiles:profile_metrics_enum_java" ]
resources_package = "org.chromium.chrome.browser.signin.services"
@@ -67,8 +67,8 @@
"//components/signin/public/android:java",
"//components/signin/public/android:signin_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java_test_support",
@@ -95,8 +95,8 @@
"//chrome/test/android:chrome_java_test_support",
"//components/signin/core/browser/android:java",
"//components/signin/public/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/signin/ui/android/BUILD.gn b/chrome/browser/signin/ui/android/BUILD.gn
index d505a9fe..5fbe2c4 100644
--- a/chrome/browser/signin/ui/android/BUILD.gn
+++ b/chrome/browser/signin/ui/android/BUILD.gn
@@ -28,12 +28,12 @@
"//components/signin/public/android:java",
"//components/user_prefs/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_no_recycler_view_java",
"//ui/android:ui_recycler_view_java",
"//ui/android:ui_utils_java",
@@ -143,9 +143,9 @@
"//components/signin/public/android:java",
"//components/signin/public/android:signin_java_test_support",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_no_recycler_view_java",
@@ -173,10 +173,10 @@
"//components/signin/public/android:java",
"//components/signin/public/android:signin_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java_test_support",
diff --git a/chrome/browser/subresource_filter/BUILD.gn b/chrome/browser/subresource_filter/BUILD.gn
index 270ebc6..5004114c 100644
--- a/chrome/browser/subresource_filter/BUILD.gn
+++ b/chrome/browser/subresource_filter/BUILD.gn
@@ -35,9 +35,9 @@
"//components/subresource_filter/android:java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/chrome/browser/tab/BUILD.gn b/chrome/browser/tab/BUILD.gn
index 443a1c1..c169fc8 100644
--- a/chrome/browser/tab/BUILD.gn
+++ b/chrome/browser/tab/BUILD.gn
@@ -75,9 +75,9 @@
"//components/security_state/core:security_state_enums_java",
"//content/public/android:content_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
"//url:origin_java",
diff --git a/chrome/browser/tab_group/BUILD.gn b/chrome/browser/tab_group/BUILD.gn
index d7a53e5..bad1a87 100644
--- a/chrome/browser/tab_group/BUILD.gn
+++ b/chrome/browser/tab_group/BUILD.gn
@@ -16,7 +16,7 @@
"//base:base_java",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -33,8 +33,8 @@
"//base:base_junit_test_support",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/tabmodel/BUILD.gn b/chrome/browser/tabmodel/BUILD.gn
index 2ed0b2939..2d9e32d 100644
--- a/chrome/browser/tabmodel/BUILD.gn
+++ b/chrome/browser/tabmodel/BUILD.gn
@@ -48,7 +48,7 @@
"//chrome/browser/tab:java",
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
@@ -75,7 +75,7 @@
"//chrome/test/android:chrome_java_test_support",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/tabmodel/internal/BUILD.gn b/chrome/browser/tabmodel/internal/BUILD.gn
index c85c52c9..2cdf432 100644
--- a/chrome/browser/tabmodel/internal/BUILD.gn
+++ b/chrome/browser/tabmodel/internal/BUILD.gn
@@ -20,6 +20,6 @@
"//base:base_java",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chrome/browser/tabpersistence/BUILD.gn b/chrome/browser/tabpersistence/BUILD.gn
index 68ba50eb..ba24263 100644
--- a/chrome/browser/tabpersistence/BUILD.gn
+++ b/chrome/browser/tabpersistence/BUILD.gn
@@ -8,7 +8,7 @@
sources = [ "android/java/src/org/chromium/chrome/browser/tabpersistence/TabStateDirectory.java" ]
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
diff --git a/chrome/browser/test_dummy/internal/BUILD.gn b/chrome/browser/test_dummy/internal/BUILD.gn
index 6826029..edffd86 100644
--- a/chrome/browser/test_dummy/internal/BUILD.gn
+++ b/chrome/browser/test_dummy/internal/BUILD.gn
@@ -18,7 +18,7 @@
"//base:base_java",
"//chrome/browser/test_dummy:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [ "android/java/src/org/chromium/chrome/browser/test_dummy/TestDummyImpl.java" ]
@@ -50,7 +50,7 @@
"//chrome/android/modules/test_dummy/public:java",
"//chrome/browser/test_dummy:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [ "android/java/src/org/chromium/chrome/browser/test_dummy/TestDummyActivity.java" ]
}
diff --git a/chrome/browser/thumbnail/generator/BUILD.gn b/chrome/browser/thumbnail/generator/BUILD.gn
index 1a78ab32..c42d28f 100644
--- a/chrome/browser/thumbnail/generator/BUILD.gn
+++ b/chrome/browser/thumbnail/generator/BUILD.gn
@@ -77,9 +77,9 @@
"//components/browser_ui/util/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
]
sources = [
@@ -121,9 +121,9 @@
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//ui/android:ui_java_test_support",
diff --git a/chrome/browser/touch_to_fill/android/BUILD.gn b/chrome/browser/touch_to_fill/android/BUILD.gn
index 7c66c8c..28f7880 100644
--- a/chrome/browser/touch_to_fill/android/BUILD.gn
+++ b/chrome/browser/touch_to_fill/android/BUILD.gn
@@ -29,7 +29,7 @@
deps = [
"//base:base_java",
"//components/browser_ui/bottomsheet/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
@@ -59,7 +59,7 @@
"//components/favicon/android:java",
"//components/module_installer/android:module_installer_java",
"//components/url_formatter/android:url_formatter_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
@@ -88,9 +88,9 @@
"//components/browser_ui/bottomsheet/android:java",
"//components/browser_ui/bottomsheet/android/test:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/touch_to_fill/android/internal/BUILD.gn b/chrome/browser/touch_to_fill/android/internal/BUILD.gn
index 2e66cb8..1dd6f4f 100644
--- a/chrome/browser/touch_to_fill/android/internal/BUILD.gn
+++ b/chrome/browser/touch_to_fill/android/internal/BUILD.gn
@@ -22,8 +22,8 @@
"//components/embedder_support/android:util_java",
"//components/favicon/android:java",
"//components/url_formatter/android:url_formatter_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_java",
]
diff --git a/chrome/browser/ui/android/appmenu/BUILD.gn b/chrome/browser/ui/android/appmenu/BUILD.gn
index d35c204..77e1eeec4 100644
--- a/chrome/browser/ui/android/appmenu/BUILD.gn
+++ b/chrome/browser/ui/android/appmenu/BUILD.gn
@@ -20,7 +20,7 @@
]
deps = [
"//chrome/browser/android/lifecycle:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
resources_package = "org.chromium.chrome.browser.ui.appmenu"
}
diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
index a677a59..c6e18f1 100644
--- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn
+++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn
@@ -30,8 +30,8 @@
"//chrome/browser/ui/android/appmenu:java",
"//components/browser_ui/widget/android:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.chrome.browser.ui.appmenu.internal"
@@ -81,11 +81,11 @@
"//components/browser_ui/widget/android:test_support_java",
"//content/public/test/android:content_java_test_support",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_full_java",
diff --git a/chrome/browser/ui/android/default_browser_promo/BUILD.gn b/chrome/browser/ui/android/default_browser_promo/BUILD.gn
index 97e4233..50f19bb 100644
--- a/chrome/browser/ui/android/default_browser_promo/BUILD.gn
+++ b/chrome/browser/ui/android/default_browser_promo/BUILD.gn
@@ -17,7 +17,7 @@
"//chrome/browser/flags:java",
"//chrome/browser/preferences:java",
"//chrome/browser/profiles/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
]
resources_package = "org.chromium.chrome.browser.ui.default_browser_promo"
diff --git a/chrome/browser/ui/android/favicon/BUILD.gn b/chrome/browser/ui/android/favicon/BUILD.gn
index 5197d67..443859b 100644
--- a/chrome/browser/ui/android/favicon/BUILD.gn
+++ b/chrome/browser/ui/android/favicon/BUILD.gn
@@ -21,8 +21,8 @@
"//components/embedder_support/android:util_java",
"//components/url_formatter/android:url_formatter_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
diff --git a/chrome/browser/ui/android/layouts/BUILD.gn b/chrome/browser/ui/android/layouts/BUILD.gn
index 89b2c4e4..de04170 100644
--- a/chrome/browser/ui/android/layouts/BUILD.gn
+++ b/chrome/browser/ui/android/layouts/BUILD.gn
@@ -27,7 +27,7 @@
"//base:base_java",
"//base:jni_java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
}
diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
index 85cfe3c..19077ae 100644
--- a/chrome/browser/ui/android/native_page/BUILD.gn
+++ b/chrome/browser/ui/android/native_page/BUILD.gn
@@ -15,6 +15,6 @@
"//components/browser_ui/styles/android:java",
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chrome/browser/ui/android/theme/BUILD.gn b/chrome/browser/ui/android/theme/BUILD.gn
index eb0ebc0..6b7034f 100644
--- a/chrome/browser/ui/android/theme/BUILD.gn
+++ b/chrome/browser/ui/android/theme/BUILD.gn
@@ -20,8 +20,8 @@
"//components/embedder_support/android:util_java",
"//components/security_state/content/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
"//ui/android:ui_no_recycler_view_java",
]
resources_package = "org.chromium.chrome.browser.theme"
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
index 9e31121..d9ace08be 100644
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -81,7 +81,7 @@
"//components/feature_engagement:feature_engagement_java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
"//ui/android:ui_utils_java",
"//url:gurl_java",
@@ -168,11 +168,11 @@
"//chrome/test/android:chrome_java_test_support",
"//components/browser_ui/widget/android:java",
"//components/feature_engagement:feature_engagement_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_library_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
@@ -200,7 +200,7 @@
"//components/browser_ui/widget/android:java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_library_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn
index 9ab66142..c9c8ade 100644
--- a/chrome/browser/ui/messages/android/BUILD.gn
+++ b/chrome/browser/ui/messages/android/BUILD.gn
@@ -40,9 +40,9 @@
"//components/infobars/android:java",
"//components/infobars/core:infobar_enums_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
"//ui/android:ui_full_java",
"//ui/android:ui_utils_java",
]
@@ -83,9 +83,9 @@
"//chrome/test/android:chrome_java_test_support",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//ui/android:ui_java_test_support",
]
diff --git a/chrome/browser/uid/android/BUILD.gn b/chrome/browser/uid/android/BUILD.gn
index 632c1fc..d724b05 100644
--- a/chrome/browser/uid/android/BUILD.gn
+++ b/chrome/browser/uid/android/BUILD.gn
@@ -14,7 +14,7 @@
deps = [
"//chrome/browser/preferences:java",
"//chrome/browser/util:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -33,9 +33,9 @@
"//chrome/browser/preferences:java",
"//chrome/browser/util:java",
"//chrome/test/android:chrome_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
]
}
diff --git a/chrome/browser/user_education/BUILD.gn b/chrome/browser/user_education/BUILD.gn
index 3e8c41c6..1ecb3fbc 100644
--- a/chrome/browser/user_education/BUILD.gn
+++ b/chrome/browser/user_education/BUILD.gn
@@ -21,8 +21,8 @@
"//components/browser_ui/util/android:java",
"//components/browser_ui/widget/android:java",
"//components/feature_engagement/public:public_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_full_java",
]
resources_package = "org.chromium.chrome.browser.user_education"
diff --git a/chrome/browser/util/BUILD.gn b/chrome/browser/util/BUILD.gn
index 4d4d93b..d913214 100644
--- a/chrome/browser/util/BUILD.gn
+++ b/chrome/browser/util/BUILD.gn
@@ -20,8 +20,8 @@
"//base:jni_java",
"//components/browser_ui/util/android:java",
"//components/embedder_support/android:util_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
@@ -48,9 +48,9 @@
"//chrome/test/android:chrome_java_test_support",
"//components/signin/core/browser/android:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/chrome/browser/video_tutorials/BUILD.gn b/chrome/browser/video_tutorials/BUILD.gn
index c1a3b24..71ac57f 100644
--- a/chrome/browser/video_tutorials/BUILD.gn
+++ b/chrome/browser/video_tutorials/BUILD.gn
@@ -79,7 +79,7 @@
"//components/browser_ui/widget/android:java",
"//components/feature_engagement/public:public_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
@@ -119,7 +119,7 @@
"//chrome/browser/profiles/android:java",
"//components/embedder_support/android:content_view_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
]
# This internal file will be replaced by a generated file so the resulting
@@ -137,7 +137,7 @@
":java",
"//base:base_java",
"//chrome/browser/image_fetcher:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/gif_player:gif_player_java",
]
}
diff --git a/chrome/browser/video_tutorials/internal/BUILD.gn b/chrome/browser/video_tutorials/internal/BUILD.gn
index 043d038..60f078ed0 100644
--- a/chrome/browser/video_tutorials/internal/BUILD.gn
+++ b/chrome/browser/video_tutorials/internal/BUILD.gn
@@ -99,10 +99,10 @@
"//components/thin_webview:java",
"//content/public/android:content_java",
"//services/media_session/public/cpp/android:media_session_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/gif_player:gif_player_java",
"//ui/android:ui_java",
]
@@ -188,12 +188,12 @@
"//chrome/test/android:chrome_java_test_support",
"//components/thin_webview:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/gif_player:gif_player_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/junit",
diff --git a/chrome/browser/webapps/android/BUILD.gn b/chrome/browser/webapps/android/BUILD.gn
index ce17c9de..0e78d73c 100644
--- a/chrome/browser/webapps/android/BUILD.gn
+++ b/chrome/browser/webapps/android/BUILD.gn
@@ -47,8 +47,8 @@
"//components/browser_ui/styles/android:java_resources",
"//components/webapps/browser/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_no_recycler_view_java",
]
diff --git a/chrome/browser/webauthn/android/BUILD.gn b/chrome/browser/webauthn/android/BUILD.gn
index 42d085d..8eb7c78 100644
--- a/chrome/browser/webauthn/android/BUILD.gn
+++ b/chrome/browser/webauthn/android/BUILD.gn
@@ -11,7 +11,7 @@
"//base:jni_java",
"//chrome/android/modules/cablev2_authenticator/public:java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/chrome/browser/xsurface/BUILD.gn b/chrome/browser/xsurface/BUILD.gn
index 63826464..12197dd 100644
--- a/chrome/browser/xsurface/BUILD.gn
+++ b/chrome/browser/xsurface/BUILD.gn
@@ -20,5 +20,5 @@
"android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScope.java",
"android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java",
]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index f28d0c0..62869a6 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -96,7 +96,7 @@
"//components/payments/content/android:java",
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
]
sources = [ "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java" ]
@@ -6996,7 +6996,7 @@
"//components/signin/public/android:java",
"//components/sync/android:sync_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
]
sources = [
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
index 668c8ee..55d604e 100644
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -43,11 +43,11 @@
"//base:base_java_test_support",
"//chrome/android:chrome_java",
"//chrome/browser/ui/android/appmenu/test:test_support_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
- "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_drawerlayout_drawerlayout_java",
+ "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
]
@@ -68,7 +68,7 @@
"//base:base_java_test_support",
"//chrome/browser/flags:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
]
@@ -106,12 +106,12 @@
"//chrome/browser/tab:java",
"//chrome/browser/ui/android/native_page:java",
"//components/embedder_support/android:util_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:com_android_support_drawerlayout_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//ui/android:ui_java_test_support",
@@ -136,8 +136,8 @@
"//chrome/android/webapk/libs/client:client_java",
"//components/webapk/android/libs/client:java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
@@ -158,7 +158,7 @@
deps = [
":chrome_java_test_pagecontroller",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
@@ -309,12 +309,6 @@
"//services/device/public/mojom:mojom_java",
"//testing/android/reporter:reporter_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
"//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:espresso_java",
@@ -322,6 +316,12 @@
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
diff --git a/chrome/test/android/test_trusted_web_activity/BUILD.gn b/chrome/test/android/test_trusted_web_activity/BUILD.gn
index 4911a9c..7328f1f 100644
--- a/chrome/test/android/test_trusted_web_activity/BUILD.gn
+++ b/chrome/test/android/test_trusted_web_activity/BUILD.gn
@@ -14,7 +14,7 @@
"src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java",
]
deps = [
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/chromecast/android/BUILD.gn b/chromecast/android/BUILD.gn
index b41d40ae..33c7281 100644
--- a/chromecast/android/BUILD.gn
+++ b/chromecast/android/BUILD.gn
@@ -63,21 +63,21 @@
public_deps = [
"//third_party/android_deps:android_support_v4_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_leanback_leanback_preference_java",
- "//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
- "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
- "//third_party/android_deps:androidx_preference_preference_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_slice_slice_builders_java",
- "//third_party/android_deps:androidx_slice_slice_core_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_tvprovider_tvprovider_java",
"//third_party/android_deps:com_android_support_design_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_leanback_leanback_preference_java",
+ "//third_party/androidx:androidx_legacy_legacy_support_v4_java",
+ "//third_party/androidx:androidx_localbroadcastmanager_localbroadcastmanager_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_slice_slice_builders_java",
+ "//third_party/androidx:androidx_slice_slice_core_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_tvprovider_tvprovider_java",
]
}
diff --git a/chromecast/base/BUILD.gn b/chromecast/base/BUILD.gn
index 4eb7c44..a2cac355 100644
--- a/chromecast/base/BUILD.gn
+++ b/chromecast/base/BUILD.gn
@@ -355,7 +355,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/chromecast/browser/android/BUILD.gn b/chromecast/browser/android/BUILD.gn
index 14131b2..c408badf 100644
--- a/chromecast/browser/android/BUILD.gn
+++ b/chromecast/browser/android/BUILD.gn
@@ -89,7 +89,7 @@
deps = [
"//base:base_java",
"//chromecast/base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -115,7 +115,7 @@
deps = [
"//base:base_java",
"//chromecast/base:base_java",
- "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
+ "//third_party/androidx:androidx_localbroadcastmanager_localbroadcastmanager_java",
]
}
@@ -185,15 +185,15 @@
"//content/public/android:content_java",
"//media/base/android:media_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
# TODO(slan): We may need to pass this in as a parameter.
- "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
- "//third_party/android_deps:androidx_slice_slice_builders_java",
+ "//third_party/androidx:androidx_localbroadcastmanager_localbroadcastmanager_java",
+ "//third_party/androidx:androidx_slice_slice_builders_java",
# Used internally for Settings UI.
- "//third_party/android_deps:androidx_slice_slice_core_java",
+ "//third_party/androidx:androidx_slice_slice_core_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -252,7 +252,7 @@
"//chromecast/base:base_java",
"//chromecast/base:cast_base_test_utils_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
+ "//third_party/androidx:androidx_localbroadcastmanager_localbroadcastmanager_java",
"//third_party/hamcrest:hamcrest_java",
]
}
diff --git a/chromecast/media/cma/backend/android/BUILD.gn b/chromecast/media/cma/backend/android/BUILD.gn
index dd4f679..4d079cc 100644
--- a/chromecast/media/cma/backend/android/BUILD.gn
+++ b/chromecast/media/cma/backend/android/BUILD.gn
@@ -73,7 +73,7 @@
"//base:jni_java",
"//chromecast/base:base_java",
"//chromecast/public:volume_control_enums_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/chromecast/public/BUILD.gn b/chromecast/public/BUILD.gn
index 1d8641fc..46f8841e 100644
--- a/chromecast/public/BUILD.gn
+++ b/chromecast/public/BUILD.gn
@@ -45,6 +45,6 @@
android_library("volume_control_enums_java") {
srcjar_deps = [ ":java_enums_volume_control" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
}
diff --git a/components/autofill/android/BUILD.gn b/components/autofill/android/BUILD.gn
index 856af4d..2234539d 100644
--- a/components/autofill/android/BUILD.gn
+++ b/components/autofill/android/BUILD.gn
@@ -42,9 +42,9 @@
":payments_autofill_java",
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_no_recycler_view_java",
]
sources = [
@@ -65,7 +65,7 @@
"java/src/org/chromium/components/autofill/Completable.java",
"java/src/org/chromium/components/autofill/EditableOption.java",
]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
java_group("autofill_java") {
diff --git a/components/autofill/android/provider/BUILD.gn b/components/autofill/android/provider/BUILD.gn
index a6de523..1050f6ad6 100644
--- a/components/autofill/android/provider/BUILD.gn
+++ b/components/autofill/android/provider/BUILD.gn
@@ -23,7 +23,7 @@
"//components/autofill/core/common/mojom:mojo_types_java",
"//components/version_info/android:version_constants_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/autofill/android/provider/test_support/BUILD.gn b/components/autofill/android/provider/test_support/BUILD.gn
index 74b3f5f..6ed8af92 100644
--- a/components/autofill/android/provider/test_support/BUILD.gn
+++ b/components/autofill/android/provider/test_support/BUILD.gn
@@ -20,7 +20,7 @@
"//components/autofill/android/provider:autofill_aidl",
"//components/autofill/android/provider:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
generate_jni("jni_headers") {
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
index 1881276..4417a697 100644
--- a/components/background_task_scheduler/BUILD.gn
+++ b/components/background_task_scheduler/BUILD.gn
@@ -60,7 +60,7 @@
# between WebView and Chrome.
android_library("background_task_scheduler_task_ids_java") {
srcjar_deps = [ ":jni_enums" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
java_cpp_enum("jni_enums") {
@@ -85,7 +85,7 @@
":background_task_scheduler_task_ids_java",
"//base:base_java",
"//content/public/android:content_main_dex_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -95,7 +95,7 @@
deps = [
":public_java",
"internal:internal_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components/background_task_scheduler/internal/BUILD.gn
index 212f839..0af7704 100644
--- a/components/background_task_scheduler/internal/BUILD.gn
+++ b/components/background_task_scheduler/internal/BUILD.gn
@@ -35,9 +35,9 @@
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
"//components/background_task_scheduler:public_java",
"//content/public/android:content_main_dex_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -74,7 +74,7 @@
"//base:jni_java",
"//components/background_task_scheduler:factory_java",
"//components/background_task_scheduler:public_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -108,8 +108,8 @@
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
"//components/background_task_scheduler:public_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/components/bookmarks/common/android/BUILD.gn b/components/bookmarks/common/android/BUILD.gn
index fa087a5..8b1a38c 100644
--- a/components/bookmarks/common/android/BUILD.gn
+++ b/components/bookmarks/common/android/BUILD.gn
@@ -19,7 +19,7 @@
android_library("bookmarks_java") {
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":bookmark_type_javagen" ]
sources = [ "java/src/org/chromium/components/bookmarks/BookmarkId.java" ]
diff --git a/components/browser_ui/banners/android/BUILD.gn b/components/browser_ui/banners/android/BUILD.gn
index 319edc5..93babc6 100644
--- a/components/browser_ui/banners/android/BUILD.gn
+++ b/components/browser_ui/banners/android/BUILD.gn
@@ -10,7 +10,7 @@
deps = [
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
]
}
diff --git a/components/browser_ui/bottomsheet/android/BUILD.gn b/components/browser_ui/bottomsheet/android/BUILD.gn
index 534e16d..e797df6 100644
--- a/components/browser_ui/bottomsheet/android/BUILD.gn
+++ b/components/browser_ui/bottomsheet/android/BUILD.gn
@@ -18,7 +18,7 @@
":java_resources",
"//base:base_java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.bottomsheet"
diff --git a/components/browser_ui/bottomsheet/android/internal/BUILD.gn b/components/browser_ui/bottomsheet/android/internal/BUILD.gn
index dfc42ed2..0c2e3ed 100644
--- a/components/browser_ui/bottomsheet/android/internal/BUILD.gn
+++ b/components/browser_ui/bottomsheet/android/internal/BUILD.gn
@@ -26,7 +26,7 @@
"//base:base_java",
"//components/browser_ui/styles/android:java_resources",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.bottomsheet.internal"
diff --git a/components/browser_ui/bottomsheet/android/test/BUILD.gn b/components/browser_ui/bottomsheet/android/test/BUILD.gn
index f8c7f8b2..e50b556 100644
--- a/components/browser_ui/bottomsheet/android/test/BUILD.gn
+++ b/components/browser_ui/bottomsheet/android/test/BUILD.gn
@@ -11,6 +11,6 @@
"..:java",
"..:manager_java",
"../internal:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/browser_ui/client_certificate/android/BUILD.gn b/components/browser_ui/client_certificate/android/BUILD.gn
index 7c03c6a..4689851 100644
--- a/components/browser_ui/client_certificate/android/BUILD.gn
+++ b/components/browser_ui/client_certificate/android/BUILD.gn
@@ -22,8 +22,8 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/browser_ui/contacts_picker/android/BUILD.gn b/components/browser_ui/contacts_picker/android/BUILD.gn
index 6bf240b8..d7664be9 100644
--- a/components/browser_ui/contacts_picker/android/BUILD.gn
+++ b/components/browser_ui/contacts_picker/android/BUILD.gn
@@ -41,10 +41,10 @@
"//components/browser_ui/widget/android:java",
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//ui/android:ui_java",
]
@@ -99,14 +99,14 @@
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/junit",
"//ui/android:ui_java",
diff --git a/components/browser_ui/display_cutout/android/BUILD.gn b/components/browser_ui/display_cutout/android/BUILD.gn
index 1e213c24..35be1d0 100644
--- a/components/browser_ui/display_cutout/android/BUILD.gn
+++ b/components/browser_ui/display_cutout/android/BUILD.gn
@@ -11,7 +11,7 @@
"//base:base_java",
"//components/browser_ui/widget/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:mojom_platform_java",
"//ui/android:ui_java",
]
diff --git a/components/browser_ui/http_auth/android/BUILD.gn b/components/browser_ui/http_auth/android/BUILD.gn
index 79bae769..374bf9d 100644
--- a/components/browser_ui/http_auth/android/BUILD.gn
+++ b/components/browser_ui/http_auth/android/BUILD.gn
@@ -14,8 +14,8 @@
"//base:base_java",
"//components/browser_ui/widget/android:java",
"//components/strings:components_strings_grd",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.http_auth"
diff --git a/components/browser_ui/media/android/BUILD.gn b/components/browser_ui/media/android/BUILD.gn
index f7fb622..a47aeda 100644
--- a/components/browser_ui/media/android/BUILD.gn
+++ b/components/browser_ui/media/android/BUILD.gn
@@ -29,7 +29,7 @@
"//services/media_session/public/cpp/android:media_session_java",
"//services/media_session/public/mojom:mojom_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
diff --git a/components/browser_ui/modaldialog/android/BUILD.gn b/components/browser_ui/modaldialog/android/BUILD.gn
index 3a64632..392f5fc 100644
--- a/components/browser_ui/modaldialog/android/BUILD.gn
+++ b/components/browser_ui/modaldialog/android/BUILD.gn
@@ -18,7 +18,7 @@
"//components/browser_ui/widget/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.modaldialog"
@@ -56,12 +56,12 @@
":java_test_resources",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java",
diff --git a/components/browser_ui/notifications/android/BUILD.gn b/components/browser_ui/notifications/android/BUILD.gn
index 83ac10b..73e62fd 100644
--- a/components/browser_ui/notifications/android/BUILD.gn
+++ b/components/browser_ui/notifications/android/BUILD.gn
@@ -22,8 +22,8 @@
deps = [
"//base:base_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
@@ -34,6 +34,6 @@
deps = [
":java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/browser_ui/photo_picker/android/BUILD.gn b/components/browser_ui/photo_picker/android/BUILD.gn
index c402ff6..7f31f68 100644
--- a/components/browser_ui/photo_picker/android/BUILD.gn
+++ b/components/browser_ui/photo_picker/android/BUILD.gn
@@ -45,12 +45,12 @@
"//components/browser_ui/widget/android:java",
"//content/public/android:content_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_vectordrawable_vectordrawable_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_vectordrawable_vectordrawable_java",
"//ui/android:ui_java",
]
srcjar_deps = [ ":photo_picker_aidl" ]
@@ -117,9 +117,9 @@
"//base:base_junit_test_support",
"//base/test:test_support_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java",
@@ -144,14 +144,14 @@
"//components/browser_ui/widget/android:java",
"//components/browser_ui/widget/android:test_support_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn
index 5916628..c60eb4f1 100644
--- a/components/browser_ui/settings/android/BUILD.gn
+++ b/components/browser_ui/settings/android/BUILD.gn
@@ -27,9 +27,9 @@
":java_resources",
"//base:base_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.settings"
@@ -39,7 +39,7 @@
deps = [
"//components/browser_ui/strings/android:browser_ui_strings_grd",
"//components/browser_ui/styles/android:java_resources",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_java_resources",
]
sources = [
diff --git a/components/browser_ui/share/android/BUILD.gn b/components/browser_ui/share/android/BUILD.gn
index 99cabeb..3a3ee3b 100644
--- a/components/browser_ui/share/android/BUILD.gn
+++ b/components/browser_ui/share/android/BUILD.gn
@@ -17,9 +17,9 @@
"//components/browser_ui/util/android:java",
"//components/dom_distiller/core/android:dom_distiller_core_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_java",
]
resources_package = "org.chromium.components.browser_ui.share"
@@ -43,9 +43,9 @@
"//base:base_java_test_support",
"//chrome/android:chrome_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//ui/android:ui_java",
diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
index dfa022b4..c419975c 100644
--- a/components/browser_ui/site_settings/android/BUILD.gn
+++ b/components/browser_ui/site_settings/android/BUILD.gn
@@ -94,8 +94,8 @@
"//content/public/android:content_java",
"//services/device/public/java:device_feature_list_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_full_java",
"//ui/android:ui_utils_java",
]
@@ -110,7 +110,7 @@
":java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/components/browser_ui/sms/android/BUILD.gn b/components/browser_ui/sms/android/BUILD.gn
index cca5118..b46244b 100644
--- a/components/browser_ui/sms/android/BUILD.gn
+++ b/components/browser_ui/sms/android/BUILD.gn
@@ -57,7 +57,7 @@
"//base:base_java",
"//components/browser_ui/styles/android:java_resources",
"//components/infobars/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
diff --git a/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn
index b6b8880..ad5679a9 100644
--- a/components/browser_ui/styles/android/BUILD.gn
+++ b/components/browser_ui/styles/android/BUILD.gn
@@ -12,8 +12,8 @@
":java_resources",
"//base:base_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
]
resources_package = "org.chromium.components.browser_ui.styles"
}
diff --git a/components/browser_ui/util/android/BUILD.gn b/components/browser_ui/util/android/BUILD.gn
index 82d23c97..aeb9c62 100644
--- a/components/browser_ui/util/android/BUILD.gn
+++ b/components/browser_ui/util/android/BUILD.gn
@@ -23,9 +23,9 @@
"//base:base_java",
"//cc:cc_java",
"//components/embedder_support/android:util_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
]
resources_package = "org.chromium.components.browser_ui.util"
}
diff --git a/components/browser_ui/webshare/android/BUILD.gn b/components/browser_ui/webshare/android/BUILD.gn
index 0e096fbc..86a33257 100644
--- a/components/browser_ui/webshare/android/BUILD.gn
+++ b/components/browser_ui/webshare/android/BUILD.gn
@@ -16,7 +16,7 @@
"//content/public/android:content_java",
"//mojo/public/java:system_java",
"//mojo/public/java/system:system_impl_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//ui/android:ui_java",
"//url/mojom:url_mojom_gurl_java",
@@ -37,8 +37,8 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/junit",
]
diff --git a/components/browser_ui/widget/android/BUILD.gn b/components/browser_ui/widget/android/BUILD.gn
index 40736fb..f3b061d 100644
--- a/components/browser_ui/widget/android/BUILD.gn
+++ b/components/browser_ui/widget/android/BUILD.gn
@@ -109,11 +109,11 @@
"//components/embedder_support/android:util_java",
"//third_party/android_deps:android_support_v4_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
- "//third_party/android_deps:androidx_interpolator_interpolator_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java",
+ "//third_party/androidx:androidx_interpolator_interpolator_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
@@ -230,7 +230,7 @@
":java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
"//third_party/hamcrest:hamcrest_library_java",
]
}
@@ -265,13 +265,13 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
@@ -323,8 +323,8 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/components/content_capture/android/BUILD.gn b/components/content_capture/android/BUILD.gn
index 7e8e020..8c86b8e3e 100644
--- a/components/content_capture/android/BUILD.gn
+++ b/components/content_capture/android/BUILD.gn
@@ -24,7 +24,7 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = [
diff --git a/components/content_settings/android/BUILD.gn b/components/content_settings/android/BUILD.gn
index c0cd44d..ef3b5ba 100644
--- a/components/content_settings/android/BUILD.gn
+++ b/components/content_settings/android/BUILD.gn
@@ -19,7 +19,7 @@
"//base:jni_java",
"//components/embedder_support/android:browser_context_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
@@ -43,7 +43,7 @@
android_library("content_settings_enums_java") {
srcjar_deps = [ ":content_settings_enums_javagen" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
java_cpp_enum("content_settings_enums_javagen") {
diff --git a/components/crash/android/BUILD.gn b/components/crash/android/BUILD.gn
index 605e9d8..bf511c4 100644
--- a/components/crash/android/BUILD.gn
+++ b/components/crash/android/BUILD.gn
@@ -22,7 +22,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums_srcjar" ]
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index e63ee91..e37bae4 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -249,7 +249,7 @@
deps = [
":api_version",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -289,7 +289,7 @@
deps = [
":cronet_api_java",
":impl_version",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
deps += cronet_impl_common_java_deps_to_package
@@ -305,7 +305,7 @@
deps = [
":cronet_api_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -324,8 +324,8 @@
":cronet_impl_common_base_java",
":cronet_impl_java_util_java",
"//net/android:net_thread_stats_uid_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -345,7 +345,7 @@
":cronet_api_java",
":cronet_impl_common_base_java",
":cronet_impl_java_util_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -378,7 +378,7 @@
]
deps = [
":cronet_api_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -404,8 +404,8 @@
":cronet_api_java",
":cronet_impl_common_base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
deps += cronet_impl_native_java_deps_to_package
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -445,7 +445,7 @@
":package_api_java",
":package_impl_native_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -771,10 +771,10 @@
sources = [ "sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java" ]
deps = [
":cronet_sample_apk_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
@@ -937,9 +937,9 @@
":cronet_impl_fake_base_java",
":cronet_impl_platform_base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
@@ -1006,9 +1006,9 @@
":cronet_api_java",
":cronet_impl_all_java",
":cronet_urlconnection_impl_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_core_java",
]
deps += cronet_javatests_deps_to_package
@@ -1050,10 +1050,10 @@
"//base:base_java_test_support",
"//net/android:net_java",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/junit",
"//third_party/netty-tcnative:netty-tcnative-so",
@@ -1100,10 +1100,10 @@
":cronet_impl_platform_base_java",
":cronet_smoketests_platform_only_apk_resources",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/netty4:netty_all_java",
]
@@ -1134,10 +1134,10 @@
":cronet_test_apk_resources",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/netty4:netty_all_java",
]
diff --git a/components/dom_distiller/core/android/BUILD.gn b/components/dom_distiller/core/android/BUILD.gn
index 0d30b82..56f40eb 100644
--- a/components/dom_distiller/core/android/BUILD.gn
+++ b/components/dom_distiller/core/android/BUILD.gn
@@ -9,7 +9,7 @@
"//base:base_java",
"//base:jni_java",
"//components/dom_distiller/core/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/download/internal/common/BUILD.gn b/components/download/internal/common/BUILD.gn
index 282015c..44d41af 100644
--- a/components/download/internal/common/BUILD.gn
+++ b/components/download/internal/common/BUILD.gn
@@ -121,8 +121,8 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_provider:android_provider_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/components/download/network/BUILD.gn b/components/download/network/BUILD.gn
index 40fb04c..474413d 100644
--- a/components/download/network/BUILD.gn
+++ b/components/download/network/BUILD.gn
@@ -46,7 +46,7 @@
"//base:base_java",
"//base:jni_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/components/download/public/common/BUILD.gn b/components/download/public/common/BUILD.gn
index a177a54..3c8df71 100644
--- a/components/download/public/common/BUILD.gn
+++ b/components/download/public/common/BUILD.gn
@@ -110,7 +110,7 @@
deps = [
"//base:base_java",
"//components/download/internal/common:internal_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/download/public/task/BUILD.gn b/components/download/public/task/BUILD.gn
index 1044fec..95a8e7c2 100644
--- a/components/download/public/task/BUILD.gn
+++ b/components/download/public/task/BUILD.gn
@@ -28,7 +28,7 @@
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/embedder_support/android/BUILD.gn b/components/embedder_support/android/BUILD.gn
index 1cec740e..95e4602 100644
--- a/components/embedder_support/android/BUILD.gn
+++ b/components/embedder_support/android/BUILD.gn
@@ -51,8 +51,8 @@
"//components/url_formatter/android:url_formatter_java",
"//content/public/android:content_main_dex_java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//url:gurl_java",
]
}
@@ -119,7 +119,7 @@
deps = [
"//base:base_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
sources = [
@@ -194,8 +194,8 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//third_party/blink/public/mojom:mojom_platform_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
@@ -245,7 +245,7 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public:blink_headers_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
@@ -294,8 +294,8 @@
deps = [
":util_java",
"//base:base_junit_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
@@ -314,11 +314,11 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//ui/android:ui_java",
"//ui/android:ui_java_test_support",
diff --git a/components/external_intents/android/BUILD.gn b/components/external_intents/android/BUILD.gn
index 5dc05eb5..9e2f0dd 100644
--- a/components/external_intents/android/BUILD.gn
+++ b/components/external_intents/android/BUILD.gn
@@ -27,8 +27,8 @@
"//components/webapk/android/libs/client:java",
"//content/public/android:content_java",
"//services/network/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
"//ui/android:ui_java",
"//url:gurl_java",
"//url:origin_java",
@@ -79,11 +79,11 @@
"//base:base_java_test_support",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//ui/android:ui_java",
"//url:gurl_java",
diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/android/BUILD.gn
index ac1dc3f..bde5ab0b 100644
--- a/components/externalauth/android/BUILD.gn
+++ b/components/externalauth/android/BUILD.gn
@@ -33,8 +33,8 @@
"//components/embedder_support/android:browser_context_java",
"//components/embedder_support/android:util_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:chromium_play_services_availability_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
"java/src/org/chromium/components/externalauth/ExternalAuthUtils.java",
diff --git a/components/favicon/android/BUILD.gn b/components/favicon/android/BUILD.gn
index 6da8dd4..cd44ec9 100644
--- a/components/favicon/android/BUILD.gn
+++ b/components/favicon/android/BUILD.gn
@@ -12,7 +12,7 @@
"//base:jni_java",
"//components/browser_ui/util/android:java",
"//components/embedder_support/android:browser_context_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
diff --git a/components/feature_engagement/internal/BUILD.gn b/components/feature_engagement/internal/BUILD.gn
index b1320da..a58db16 100644
--- a/components/feature_engagement/internal/BUILD.gn
+++ b/components/feature_engagement/internal/BUILD.gn
@@ -135,7 +135,7 @@
"//base:base_java",
"//base:jni_java",
"//components/feature_engagement/public:public_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/feature_engagement/public/BUILD.gn b/components/feature_engagement/public/BUILD.gn
index 1165356..02a3f8b9 100644
--- a/components/feature_engagement/public/BUILD.gn
+++ b/components/feature_engagement/public/BUILD.gn
@@ -66,7 +66,7 @@
deps = [
":jni_headers",
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
index d9663411..1c608df5 100644
--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
@@ -13,8 +13,8 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
index ecd8af0..cff0c921 100644
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
@@ -19,7 +19,7 @@
"//base:base_java",
"//base:jni_java",
"//components/gcm_driver/android:gcm_driver_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/infobars/android/BUILD.gn b/components/infobars/android/BUILD.gn
index 876b6f7a..12c18d9e 100644
--- a/components/infobars/android/BUILD.gn
+++ b/components/infobars/android/BUILD.gn
@@ -71,9 +71,9 @@
"//base:jni_java",
"//components/browser_ui/widget/android:java",
"//components/infobars/core:infobar_enums_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -85,7 +85,7 @@
}
android_library("infobar_android_enums_java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":infobar_android_enums" ]
}
@@ -108,11 +108,11 @@
"//base:base_java_test_support",
"//components/browser_ui/styles/android:java_resources",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
]
}
diff --git a/components/infobars/core/BUILD.gn b/components/infobars/core/BUILD.gn
index 390c7e2..a19199f 100644
--- a/components/infobars/core/BUILD.gn
+++ b/components/infobars/core/BUILD.gn
@@ -47,7 +47,7 @@
}
android_library("infobar_enums_java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":infobar_generated_enums" ]
}
diff --git a/components/javascript_dialogs/android/BUILD.gn b/components/javascript_dialogs/android/BUILD.gn
index 6fe6f1d..4d2b3ce9 100644
--- a/components/javascript_dialogs/android/BUILD.gn
+++ b/components/javascript_dialogs/android/BUILD.gn
@@ -24,7 +24,7 @@
"//base:jni_java",
"//components/browser_ui/styles/android:java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
}
diff --git a/components/location/android/BUILD.gn b/components/location/android/BUILD.gn
index 3d1ad4c..7c791b0 100644
--- a/components/location/android/BUILD.gn
+++ b/components/location/android/BUILD.gn
@@ -14,7 +14,7 @@
android_library("location_java") {
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
sources = [ "java/src/org/chromium/components/location/LocationUtils.java" ]
diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn
index fda7b57b..6d05c4f4 100644
--- a/components/media_router/browser/android/BUILD.gn
+++ b/components/media_router/browser/android/BUILD.gn
@@ -21,12 +21,12 @@
"//content/public/android:content_java",
"//services/media_session/public/cpp/android:media_session_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
"//third_party/android_media:android_media_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
]
sources = [
"java/src/org/chromium/components/media_router/BaseMediaRouteDialogManager.java",
@@ -105,8 +105,8 @@
"//components/browser_ui/media/android:java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//third_party/hamcrest:hamcrest_java",
]
}
@@ -149,9 +149,9 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/components/media_router/test/android/cast_emulator/BUILD.gn
index 610908a..14be15c 100644
--- a/components/media_router/test/android/cast_emulator/BUILD.gn
+++ b/components/media_router/test/android/cast_emulator/BUILD.gn
@@ -23,6 +23,6 @@
"$google_play_services_package:google_play_services_cast_java",
"//base:base_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
]
}
diff --git a/components/messages/android/BUILD.gn b/components/messages/android/BUILD.gn
index a5acfeb..202e598f 100644
--- a/components/messages/android/BUILD.gn
+++ b/components/messages/android/BUILD.gn
@@ -32,9 +32,9 @@
"//components/browser_ui/banners/android:java",
"//components/browser_ui/widget/android:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_java",
]
srcjar_deps = [ ":message_enums_java" ]
@@ -123,14 +123,14 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_java",
@@ -153,8 +153,8 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_core_java",
"//third_party/hamcrest:hamcrest_library_java",
"//third_party/junit",
diff --git a/components/messages/android/internal/BUILD.gn b/components/messages/android/internal/BUILD.gn
index 30525f9..6bf01ca 100644
--- a/components/messages/android/internal/BUILD.gn
+++ b/components/messages/android/internal/BUILD.gn
@@ -15,7 +15,7 @@
"..:java",
"..:manager_java",
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
]
}
@@ -32,7 +32,7 @@
"..:java",
"..:manager_java",
"//base:base_junit_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/components/minidump_uploader/BUILD.gn b/components/minidump_uploader/BUILD.gn
index 36ed46e..378f193e 100644
--- a/components/minidump_uploader/BUILD.gn
+++ b/components/minidump_uploader/BUILD.gn
@@ -28,7 +28,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
@@ -54,8 +54,8 @@
":minidump_uploader_java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
sources = [
diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
index 67028f6..edf4a745 100644
--- a/components/module_installer/android/BUILD.gn
+++ b/components/module_installer/android/BUILD.gn
@@ -36,7 +36,7 @@
"//base:base_java",
"//base:jni_java",
"//components/crash/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/google_android_play_core:com_google_android_play_core_java",
]
diff --git a/components/navigation_interception/android/BUILD.gn b/components/navigation_interception/android/BUILD.gn
index 798a3842c..92fc788b 100644
--- a/components/navigation_interception/android/BUILD.gn
+++ b/components/navigation_interception/android/BUILD.gn
@@ -7,7 +7,7 @@
android_library("navigation_interception_java") {
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:origin_java",
]
sources = [
diff --git a/components/offline_items_collection/core/BUILD.gn b/components/offline_items_collection/core/BUILD.gn
index 811da5bbf..641de61 100644
--- a/components/offline_items_collection/core/BUILD.gn
+++ b/components/offline_items_collection/core/BUILD.gn
@@ -112,7 +112,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 06ca8e2..10486d7e 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -382,9 +382,9 @@
"//components/query_tiles:query_tile_java",
"//components/security_state/core:security_state_enums_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
diff --git a/components/page_info/android/BUILD.gn b/components/page_info/android/BUILD.gn
index c34a66a..371eb7a 100644
--- a/components/page_info/android/BUILD.gn
+++ b/components/page_info/android/BUILD.gn
@@ -122,8 +122,8 @@
"//content/public/android:content_java",
"//services/device/public/java:device_feature_list_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_preference_preference_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//ui/android:ui_java",
"//url:gurl_java",
]
@@ -144,5 +144,5 @@
android_library("page_info_action_enum_java") {
srcjar_deps = [ "//components/page_info:page_info_action_javagen" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
diff --git a/components/paint_preview/player/android/BUILD.gn b/components/paint_preview/player/android/BUILD.gn
index 2a3e015..19cfff5e 100644
--- a/components/paint_preview/player/android/BUILD.gn
+++ b/components/paint_preview/player/android/BUILD.gn
@@ -86,8 +86,8 @@
"//base:jni_java",
"//components/paint_preview/browser/android:java",
"//components/paint_preview/common/proto:proto_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
"//ui/android:ui_java_resources",
"//url:gurl_java",
@@ -133,9 +133,9 @@
"//components/paint_preview/common/proto:proto_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit",
"//third_party/ub-uiautomator:ub_uiautomator_java",
@@ -185,7 +185,7 @@
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
"//url:gurl_java",
]
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
index 0a2dfcd..44deef3 100644
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
@@ -427,7 +427,7 @@
# Wrap the java_cpp_enum in android_library so it can be used by both
# chrome_java and modules.
android_library("password_manager_java_enums") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":password_manager_java_enums_srcjar" ]
}
diff --git a/components/payments/content/android/BUILD.gn b/components/payments/content/android/BUILD.gn
index deeb8c2..ab29c4c75 100644
--- a/components/payments/content/android/BUILD.gn
+++ b/components/payments/content/android/BUILD.gn
@@ -113,7 +113,7 @@
"//base:jni_java",
"//components/payments/mojom:mojom_java",
"//content/public/android:content_main_dex_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [
":error_strings_generated_srcjar",
@@ -182,9 +182,9 @@
"//mojo/public/java:bindings_java",
"//mojo/public/java:system_java",
"//services/service_manager/public/java:service_manager_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_collection_collection_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//ui/android:ui_no_recycler_view_java",
"//ui/android:ui_utils_java",
@@ -220,8 +220,8 @@
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
"//mojo/public/java:bindings_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//url:origin_java",
]
@@ -289,9 +289,9 @@
"//components/payments/content/android:service_java",
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/mockito:mockito_java",
"//url:gurl_java",
@@ -318,10 +318,10 @@
"//components/payments/mojom:mojom_java",
"//content/public/android:content_java",
"//mojo/public/java:system_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
@@ -339,9 +339,9 @@
"//base:base_java_test_support",
"//components/payments/mojom:mojom_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn
index f17faa5..3cfa933 100644
--- a/components/permissions/android/BUILD.gn
+++ b/components/permissions/android/BUILD.gn
@@ -132,7 +132,7 @@
"//components/content_settings/android:content_settings_enums_java",
"//content/public/android:content_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/policy/android/BUILD.gn b/components/policy/android/BUILD.gn
index c737fd8d..0618384 100644
--- a/components/policy/android/BUILD.gn
+++ b/components/policy/android/BUILD.gn
@@ -23,7 +23,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":java_switches_srcjar" ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -43,7 +43,7 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
]
sources = [
diff --git a/components/prefs/android/BUILD.gn b/components/prefs/android/BUILD.gn
index fccae3c..7efb54ce6 100644
--- a/components/prefs/android/BUILD.gn
+++ b/components/prefs/android/BUILD.gn
@@ -13,7 +13,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/components/query_tiles/BUILD.gn b/components/query_tiles/BUILD.gn
index 3195ccf..ac64c73e 100644
--- a/components/query_tiles/BUILD.gn
+++ b/components/query_tiles/BUILD.gn
@@ -81,7 +81,7 @@
deps = [
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -99,7 +99,7 @@
"//base:base_java",
"//base:jni_java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
diff --git a/components/safe_browsing/android/BUILD.gn b/components/safe_browsing/android/BUILD.gn
index 6e8916e..f685956 100644
--- a/components/safe_browsing/android/BUILD.gn
+++ b/components/safe_browsing/android/BUILD.gn
@@ -9,7 +9,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = [
diff --git a/components/search_engines/android/BUILD.gn b/components/search_engines/android/BUILD.gn
index 8d711dd..e80cb10 100644
--- a/components/search_engines/android/BUILD.gn
+++ b/components/search_engines/android/BUILD.gn
@@ -9,7 +9,7 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/security_state/content/android/BUILD.gn b/components/security_state/content/android/BUILD.gn
index 2012058..da9ed875 100644
--- a/components/security_state/content/android/BUILD.gn
+++ b/components/security_state/content/android/BUILD.gn
@@ -29,7 +29,7 @@
"//base:jni_java",
"//components/security_state/core:security_state_enums_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/components/security_state/core/BUILD.gn b/components/security_state/core/BUILD.gn
index fbadf7ed..c76ee42 100644
--- a/components/security_state/core/BUILD.gn
+++ b/components/security_state/core/BUILD.gn
@@ -31,7 +31,7 @@
android_library("security_state_enums_java") {
srcjar_deps = [ ":security_state_enums" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
}
diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn
index a3cac9b..ed063470 100644
--- a/components/signin/core/browser/BUILD.gn
+++ b/components/signin/core/browser/BUILD.gn
@@ -153,7 +153,7 @@
if (is_android) {
android_library("signin_enums_java") {
srcjar_deps = [ ":signin_enums_javagen" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
java_cpp_enum("signin_enums_javagen") {
diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
index d8796ba..ed889a5e 100644
--- a/components/signin/core/browser/android/BUILD.gn
+++ b/components/signin/core/browser/android/BUILD.gn
@@ -19,8 +19,8 @@
"//base:jni_java",
"//net/android:net_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:chromium_play_services_availability_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
diff --git a/components/signin/public/android/BUILD.gn b/components/signin/public/android/BUILD.gn
index f9f9280..ab2e26f 100644
--- a/components/signin/public/android/BUILD.gn
+++ b/components/signin/public/android/BUILD.gn
@@ -7,7 +7,7 @@
"//components/signin/core/browser/android:java",
"//net/android:net_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [
@@ -53,7 +53,7 @@
":signin_test_resources",
"//base:base_java",
"//components/signin/core/browser/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
"java/src/org/chromium/components/signin/test/util/AccountHolder.java",
@@ -77,10 +77,10 @@
"//base:base_java",
"//base:base_java_test_support",
"//components/signin/core/browser/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/components/strictmode/android/BUILD.gn b/components/strictmode/android/BUILD.gn
index 7fe542c9..5997c7d 100644
--- a/components/strictmode/android/BUILD.gn
+++ b/components/strictmode/android/BUILD.gn
@@ -14,7 +14,7 @@
]
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -25,10 +25,10 @@
":java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/components/subresource_filter/android/BUILD.gn b/components/subresource_filter/android/BUILD.gn
index 4360f5ca..fbe3a1a 100644
--- a/components/subresource_filter/android/BUILD.gn
+++ b/components/subresource_filter/android/BUILD.gn
@@ -23,7 +23,7 @@
"//base:jni_java",
"//components/infobars/android:infobar_android_enums_java",
"//components/infobars/android:java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
"//ui/android:ui_no_recycler_view_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
index 7ca181c..c741f0b 100644
--- a/components/sync/android/BUILD.gn
+++ b/components/sync/android/BUILD.gn
@@ -11,8 +11,8 @@
"//base:jni_java",
"//components/signin/core/browser/android:java",
"//net/android:net_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums" ]
diff --git a/components/thin_webview/BUILD.gn b/components/thin_webview/BUILD.gn
index 4a58a747..204b6a05 100644
--- a/components/thin_webview/BUILD.gn
+++ b/components/thin_webview/BUILD.gn
@@ -25,7 +25,7 @@
"//base:base_java",
"//components/embedder_support/android:web_contents_delegate_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
}
diff --git a/components/thin_webview/internal/BUILD.gn b/components/thin_webview/internal/BUILD.gn
index 09d12db..53bb91d 100644
--- a/components/thin_webview/internal/BUILD.gn
+++ b/components/thin_webview/internal/BUILD.gn
@@ -40,7 +40,7 @@
"//components/embedder_support/android:web_contents_delegate_java",
"//components/thin_webview:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/components/translate/content/android/BUILD.gn b/components/translate/content/android/BUILD.gn
index 6905e93..2ceac89 100644
--- a/components/translate/content/android/BUILD.gn
+++ b/components/translate/content/android/BUILD.gn
@@ -37,10 +37,10 @@
":java_resources",
"//base:base_java",
"//components/browser_ui/widget/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
@@ -62,7 +62,7 @@
}
android_library("translate_android_enums_java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":translate_android_enums" ]
}
@@ -74,11 +74,11 @@
deps = [
":java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
]
}
diff --git a/components/translate/core/common/BUILD.gn b/components/translate/core/common/BUILD.gn
index b3350b2..01627c32 100644
--- a/components/translate/core/common/BUILD.gn
+++ b/components/translate/core/common/BUILD.gn
@@ -49,7 +49,7 @@
}
android_library("translate_infobar_event_enum_java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":translate_infobar_event_enum" ]
}
diff --git a/components/url_formatter/android/BUILD.gn b/components/url_formatter/android/BUILD.gn
index fcef32c..f32125e 100644
--- a/components/url_formatter/android/BUILD.gn
+++ b/components/url_formatter/android/BUILD.gn
@@ -8,7 +8,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//url:gurl_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -33,9 +33,9 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//url:gurl_android_test_helper_java",
"//url:gurl_java",
diff --git a/components/user_prefs/android/BUILD.gn b/components/user_prefs/android/BUILD.gn
index cfffb08..6f18ebf 100644
--- a/components/user_prefs/android/BUILD.gn
+++ b/components/user_prefs/android/BUILD.gn
@@ -15,7 +15,7 @@
"//base:jni_java",
"//components/embedder_support/android:browser_context_java",
"//components/prefs/android:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn
index 5d97b39..572b0f4 100644
--- a/components/variations/BUILD.gn
+++ b/components/variations/BUILD.gn
@@ -137,7 +137,7 @@
android_library("load_seed_result_enum_java") {
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":load_seed_result_enum_srcjar" ]
}
diff --git a/components/variations/android/BUILD.gn b/components/variations/android/BUILD.gn
index 0897cd1..9885b07 100644
--- a/components/variations/android/BUILD.gn
+++ b/components/variations/android/BUILD.gn
@@ -8,7 +8,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = [
diff --git a/components/version_info/android/BUILD.gn b/components/version_info/android/BUILD.gn
index 267a450..4698418 100644
--- a/components/version_info/android/BUILD.gn
+++ b/components/version_info/android/BUILD.gn
@@ -18,7 +18,7 @@
deps = [
":generate_version_constants",
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":channel_enum_srcjar" ]
}
diff --git a/components/webapk/android/libs/client/BUILD.gn b/components/webapk/android/libs/client/BUILD.gn
index 053a47c6..88e4275e 100644
--- a/components/webapk/android/libs/client/BUILD.gn
+++ b/components/webapk/android/libs/client/BUILD.gn
@@ -13,7 +13,7 @@
deps = [
"//base:base_java",
"//components/webapk/android/libs/common:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/components/webapps/browser/android/BUILD.gn b/components/webapps/browser/android/BUILD.gn
index 06f6bc7..ef05c63 100644
--- a/components/webapps/browser/android/BUILD.gn
+++ b/components/webapps/browser/android/BUILD.gn
@@ -32,7 +32,7 @@
"//components/infobars/android:java",
"//components/webapk/android/libs/client:java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
"//url:gurl_java",
]
@@ -140,8 +140,8 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
"//ui/android:ui_no_recycler_view_java",
diff --git a/components/webrtc/android/BUILD.gn b/components/webrtc/android/BUILD.gn
index 2da4164..d6375b4 100644
--- a/components/webrtc/android/BUILD.gn
+++ b/components/webrtc/android/BUILD.gn
@@ -14,8 +14,8 @@
"//base:base_java",
"//components/browser_ui/notifications/android:java",
"//components/url_formatter/android:url_formatter_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
]
resources_package = "org.chromium.components.webrtc"
}
diff --git a/components/webxr/android/BUILD.gn b/components/webxr/android/BUILD.gn
index 98a2ca8..392403c 100644
--- a/components/webxr/android/BUILD.gn
+++ b/components/webxr/android/BUILD.gn
@@ -67,7 +67,7 @@
deps = [
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -79,9 +79,9 @@
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
"//ui/android:ui_java",
]
@@ -124,7 +124,7 @@
}
android_library("webxr_android_enums_java") {
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":webxr_android_enums" ]
}
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index bb81b96d..b4a4e0a 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -86,8 +86,8 @@
":content_java_resources",
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
sources = [
@@ -171,10 +171,10 @@
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/blink/public/mojom:mojom_core_java",
@@ -488,10 +488,6 @@
"//services/device/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
"//services/test/echo/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_sdk:android_test_base_java",
@@ -499,6 +495,10 @@
"//third_party/android_sdk:android_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public:blink_headers_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/hamcrest:hamcrest_java",
@@ -622,8 +622,8 @@
"//mojo/public/java:bindings_java",
"//mojo/public/mojom/base:base_java",
"//services/device/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/hamcrest:hamcrest_java",
"//ui/android:ui_java",
diff --git a/content/public/test/android/BUILD.gn b/content/public/test/android/BUILD.gn
index d905a475..63111ab 100644
--- a/content/public/test/android/BUILD.gn
+++ b/content/public/test/android/BUILD.gn
@@ -25,8 +25,8 @@
"//mojo/public/java:bindings_java",
"//net/android:net_java",
"//services/service_manager/public/java:service_manager_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java",
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 2ab1995..3dc5403 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -251,9 +251,9 @@
"//content/public/test/android:content_java_test_support",
"//content/shell/android:content_shell_java",
"//mojo/public/java/system:test_support_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java",
@@ -274,7 +274,7 @@
"//base:base_java",
"//content/public/android:content_java",
"//testing/android/native_test:native_test_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_java",
]
sources = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ]
diff --git a/device/BUILD.gn b/device/BUILD.gn
index d80c1eb6..cb55563 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -413,8 +413,8 @@
"//base:base_java",
"//components/location/android:location_java",
"//device/bluetooth:java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_sdk:android_test_mock_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":bluetooth_test_javagen" ]
@@ -431,7 +431,7 @@
"//base:base_junit_test_support",
"//device/gamepad:java",
"//mojo/public/java:bindings_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/hamcrest:hamcrest_java",
]
srcjar_deps = [ "//device/gamepad:java_enums_srcjar" ]
diff --git a/device/gamepad/BUILD.gn b/device/gamepad/BUILD.gn
index fdc7c7f1..4f2ddf5 100644
--- a/device/gamepad/BUILD.gn
+++ b/device/gamepad/BUILD.gn
@@ -204,7 +204,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums_srcjar" ]
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index 39766b7..886dbbf 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -163,7 +163,7 @@
":media_java_resources",
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [
@@ -198,7 +198,7 @@
android_library("display_java") {
sources = [ "java/src/org/chromium/media/DisplayCompat.java" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
junit_binary("media_base_junit_tests") {
@@ -211,7 +211,7 @@
":media_java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/media/capture/content/android/BUILD.gn b/media/capture/content/android/BUILD.gn
index 5343fa2..879405e 100644
--- a/media/capture/content/android/BUILD.gn
+++ b/media/capture/content/android/BUILD.gn
@@ -37,7 +37,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [ "java/src/org/chromium/media/ScreenCapture.java" ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/media/capture/video/android/BUILD.gn b/media/capture/video/android/BUILD.gn
index d2c29492..0384457 100644
--- a/media/capture/video/android/BUILD.gn
+++ b/media/capture/video/android/BUILD.gn
@@ -52,7 +52,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
diff --git a/mojo/public/java/system/BUILD.gn b/mojo/public/java/system/BUILD.gn
index 8e22acd..d3f5135e 100644
--- a/mojo/public/java/system/BUILD.gn
+++ b/mojo/public/java/system/BUILD.gn
@@ -72,7 +72,7 @@
sources = [ "javatests/src/org/chromium/mojo/MojoTestRule.java" ]
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
]
}
@@ -125,8 +125,8 @@
"//mojo/public/interfaces/bindings/tests:test_mojom_import_java",
"//mojo/public/java:bindings_java",
"//mojo/public/java:system_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
@@ -164,8 +164,8 @@
"//base:base_java",
"//mojo/public/interfaces/bindings/tests:test_interfaces",
"//mojo/public/java:bindings_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_runner_java",
]
shared_libraries = [ ":mojo_java_unittests" ]
apk_name = "MojoTest"
diff --git a/net/android/BUILD.gn b/net/android/BUILD.gn
index f795a71e..a9509d9 100644
--- a/net/android/BUILD.gn
+++ b/net/android/BUILD.gn
@@ -33,8 +33,8 @@
":net_thread_stats_uid_java",
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [
@@ -58,7 +58,7 @@
android_library("embedded_test_server_aidl_java") {
testonly = true
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
srcjar_deps = [ ":embedded_test_server_aidl" ]
}
@@ -77,11 +77,11 @@
":net_java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
"//third_party/junit",
]
srcjar_deps = [ ":net_java_test_support_enums_srcjar" ]
@@ -188,10 +188,10 @@
":net_java_test_support",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index 14a948d3..31e651d 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -426,7 +426,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_java",
]
sources = [
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn
index ad5957f4..dfc46de 100644
--- a/remoting/android/BUILD.gn
+++ b/remoting/android/BUILD.gn
@@ -184,8 +184,8 @@
":remoting_android_client_java",
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
]
if (!is_java_debug) {
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 9027402..c5c01bfe 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -124,7 +124,7 @@
"//services/device/public/mojom:mojom_java",
"//services/shape_detection:shape_detection_java",
"//skia/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -149,10 +149,10 @@
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_test_monitor_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_monitor_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//ui/gfx/geometry/mojom:mojom_java",
]
diff --git a/services/device/battery/android/BUILD.gn b/services/device/battery/android/BUILD.gn
index 8a2045a..283f33d 100644
--- a/services/device/battery/android/BUILD.gn
+++ b/services/device/battery/android/BUILD.gn
@@ -19,7 +19,7 @@
"//mojo/public/java:system_java",
"//services/device/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
index 11145c0..0a588b3 100644
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
@@ -164,8 +164,8 @@
"//base:jni_java",
"//components/location/android:location_java",
"//services/device/public/java:geolocation_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:chromium_play_services_availability_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
diff --git a/services/device/nfc/android/BUILD.gn b/services/device/nfc/android/BUILD.gn
index c210766..cca60ca25 100644
--- a/services/device/nfc/android/BUILD.gn
+++ b/services/device/nfc/android/BUILD.gn
@@ -29,6 +29,6 @@
"//services/device/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
"//services/service_manager/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/services/media_session/public/cpp/android/BUILD.gn b/services/media_session/public/cpp/android/BUILD.gn
index ffa37cf..d4be86df 100644
--- a/services/media_session/public/cpp/android/BUILD.gn
+++ b/services/media_session/public/cpp/android/BUILD.gn
@@ -18,7 +18,7 @@
android_library("media_session_java") {
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = _jni_sources
}
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index ef8cd68..a5f70b7 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -56,7 +56,7 @@
"//base:base_java_test_support",
"//testing/android/reporter:reporter_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
sources = [
"java/src/org/chromium/native_test/NativeBrowserTest.java",
diff --git a/third_party/android_deps/utils/BUILD.gn b/third_party/android_deps/utils/BUILD.gn
index 9a81ab1..0e70044 100644
--- a/third_party/android_deps/utils/BUILD.gn
+++ b/third_party/android_deps/utils/BUILD.gn
@@ -6,5 +6,5 @@
android_library("java") {
sources = [ "java/org/chromium/utils/ContextUtils.java" ]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
diff --git a/third_party/android_media/BUILD.gn b/third_party/android_media/BUILD.gn
index 8170175..d8326b63 100644
--- a/third_party/android_media/BUILD.gn
+++ b/third_party/android_media/BUILD.gn
@@ -13,7 +13,7 @@
]
deps = [
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
]
}
@@ -24,6 +24,6 @@
deps = [
":android_media_resources",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
]
}
diff --git a/third_party/android_provider/BUILD.gn b/third_party/android_provider/BUILD.gn
index 34bedb42..e2e5bc6 100644
--- a/third_party/android_provider/BUILD.gn
+++ b/third_party/android_provider/BUILD.gn
@@ -10,5 +10,5 @@
sources = [
"java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java",
]
- deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
diff --git a/third_party/android_sdk/androidx_browser/BUILD.gn b/third_party/android_sdk/androidx_browser/BUILD.gn
index fd1042115d..e41dd30 100644
--- a/third_party/android_sdk/androidx_browser/BUILD.gn
+++ b/third_party/android_sdk/androidx_browser/BUILD.gn
@@ -41,11 +41,11 @@
"./src/browser/browser/src/main/java/androidx/browser/trusted/splashscreens/SplashScreenVersion.java",
]
deps = [
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_collection_collection_java",
- "//third_party/android_deps:androidx_concurrent_concurrent_futures_java",
- "//third_party/android_deps:androidx_core_core_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_collection_collection_java",
+ "//third_party/androidx:androidx_concurrent_concurrent_futures_java",
+ "//third_party/androidx:androidx_core_core_java",
]
srcjar_deps = [ ":androidx_browser_service_aidl" ]
chromium_code = false
diff --git a/third_party/android_swipe_refresh/BUILD.gn b/third_party/android_swipe_refresh/BUILD.gn
index 8224213..93fc6aa3 100644
--- a/third_party/android_swipe_refresh/BUILD.gn
+++ b/third_party/android_swipe_refresh/BUILD.gn
@@ -14,7 +14,7 @@
"java/src/org/chromium/third_party/android/swiperefresh/SwipeRefreshLayout.java",
]
deps = [
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_interpolator_interpolator_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_interpolator_interpolator_java",
]
}
diff --git a/third_party/blink/public/BUILD.gn b/third_party/blink/public/BUILD.gn
index eb9979c..a2c6007 100644
--- a/third_party/blink/public/BUILD.gn
+++ b/third_party/blink/public/BUILD.gn
@@ -83,8 +83,8 @@
android_library("blink_headers_java") {
deps = [
"//services/network/public/mojom:mojom_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":blink_headers_java_enums_srcjar" ]
}
diff --git a/tools/android/audio_focus_grabber/BUILD.gn b/tools/android/audio_focus_grabber/BUILD.gn
index 144b80e..08cfabb 100644
--- a/tools/android/audio_focus_grabber/BUILD.gn
+++ b/tools/android/audio_focus_grabber/BUILD.gn
@@ -12,8 +12,8 @@
deps = [
":audio_focus_grabber_apk_resources",
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
]
sources = [
diff --git a/tools/android/customtabs_benchmark/BUILD.gn b/tools/android/customtabs_benchmark/BUILD.gn
index 45dde34..39d6ef0 100644
--- a/tools/android/customtabs_benchmark/BUILD.gn
+++ b/tools/android/customtabs_benchmark/BUILD.gn
@@ -24,7 +24,7 @@
deps = [
":customtabs_benchmark_apk_resources",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
index 62033b4f..d844c98b 100644
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -228,10 +228,10 @@
]
deps = [
"//base:base_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
]
}
@@ -361,12 +361,12 @@
":ui_utils_java",
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_asynclayoutinflater_asynclayoutinflater_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_vectordrawable_vectordrawable_animated_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_asynclayoutinflater_asynclayoutinflater_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_vectordrawable_vectordrawable_animated_java",
"//ui/base/cursor/mojom:cursor_type_java",
"//url:gurl_java",
]
@@ -385,8 +385,8 @@
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
deps = [
":ui_no_recycler_view_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_recyclerview_recyclerview_java",
]
}
@@ -417,9 +417,9 @@
"//base:base_java",
"//base:base_java_test_support",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit",
]
}
@@ -473,13 +473,13 @@
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_asynclayoutinflater_asynclayoutinflater_java",
- "//third_party/android_deps:androidx_test_core_java",
- "//third_party/android_deps:androidx_test_ext_junit_java",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_asynclayoutinflater_asynclayoutinflater_java",
+ "//third_party/androidx:androidx_test_core_java",
+ "//third_party/androidx:androidx_test_ext_junit_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/mockito:mockito_java",
"//url:gurl_java",
@@ -549,7 +549,7 @@
"//base:base_java_test_support",
"//base:jni_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
]
}
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 2b6d33e4..73776036 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -141,7 +141,7 @@
deps = [
"//base:base_java",
"//base:jni_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
@@ -315,10 +315,10 @@
"//base:base_java_test_support",
"//base:jni_java",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
diff --git a/weblayer/browser/android/javatests/BUILD.gn b/weblayer/browser/android/javatests/BUILD.gn
index 9113057..c72b06d 100644
--- a/weblayer/browser/android/javatests/BUILD.gn
+++ b/weblayer/browser/android/javatests/BUILD.gn
@@ -54,14 +54,14 @@
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_activity_activity_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_activity_activity_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//weblayer/browser/java:interfaces_java",
@@ -100,12 +100,12 @@
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java_test_support",
@@ -135,10 +135,10 @@
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java_test_support",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
"//third_party/hamcrest:hamcrest_java",
"//third_party/junit:junit",
"//ui/android:ui_java_test_support",
@@ -262,9 +262,9 @@
"//base:base_java",
"//base:base_java_test_support",
"//content/public/test/android:content_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
"//weblayer/public/java",
"//weblayer/public/javatestutil:test_java",
diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn
index 644da7b..e68a3764 100644
--- a/weblayer/browser/java/BUILD.gn
+++ b/weblayer/browser/java/BUILD.gn
@@ -267,15 +267,15 @@
"//services/network/public/mojom:cookies_mojom_java",
"//services/network/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_media_media_java",
- "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
- "//third_party/android_deps:androidx_preference_preference_java",
"//third_party/android_deps:material_design_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_media_media_java",
+ "//third_party/androidx:androidx_mediarouter_mediarouter_java",
+ "//third_party/androidx:androidx_preference_preference_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//ui/android:ui_full_java",
"//ui/android:ui_java",
@@ -331,7 +331,7 @@
"//net/android:net_java",
"//services/device/public/java:geolocation_java",
"//services/device/public/java:geolocation_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_full_java",
]
srcjar_deps = [ ":test_aidl" ]
@@ -352,8 +352,8 @@
"//content/public/android:content_java",
"//mojo/public/java:bindings_java",
"//mojo/public/java:system_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:robolectric_all_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/blink/public/mojom:android_mojo_bindings_java",
"//third_party/mockito:mockito_java",
"//ui/android:ui_no_recycler_view_java",
@@ -486,7 +486,7 @@
deps = [
":base_module_interfaces_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ ":aidl" ]
diff --git a/weblayer/public/java/BUILD.gn b/weblayer/public/java/BUILD.gn
index bfc9dd1..be60f83 100644
--- a/weblayer/public/java/BUILD.gn
+++ b/weblayer/public/java/BUILD.gn
@@ -117,12 +117,12 @@
":client_resources",
":client_version",
":weblayer_client_manifest",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_appcompat_appcompat_java",
- "//third_party/android_deps:androidx_core_core_java",
- "//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
- "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_appcompat_appcompat_java",
+ "//third_party/androidx:androidx_core_core_java",
+ "//third_party/androidx:androidx_fragment_fragment_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_common_java",
+ "//third_party/androidx:androidx_lifecycle_lifecycle_viewmodel_java",
"//weblayer/browser/java:base_module_interfaces_java",
"//weblayer/browser/java:interfaces_java",
]
diff --git a/weblayer/public/javatests/BUILD.gn b/weblayer/public/javatests/BUILD.gn
index 5bb56de..e7453c3 100644
--- a/weblayer/public/javatests/BUILD.gn
+++ b/weblayer/public/javatests/BUILD.gn
@@ -14,8 +14,8 @@
deps = [
"//base:base_java",
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_test_runner_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_test_runner_java",
"//third_party/junit:junit",
"//weblayer/public/java",
]
diff --git a/weblayer/public/javatestutil/BUILD.gn b/weblayer/public/javatestutil/BUILD.gn
index 0562ed7..b180f09 100644
--- a/weblayer/public/javatestutil/BUILD.gn
+++ b/weblayer/public/javatestutil/BUILD.gn
@@ -14,7 +14,7 @@
deps = [
"//base:base_java_test_support",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/junit:junit",
"//weblayer/browser/java:base_module_interfaces_java",
"//weblayer/browser/java:interfaces_java",
diff --git a/weblayer/shell/android/BUILD.gn b/weblayer/shell/android/BUILD.gn
index 83cf656..59eb0343 100644
--- a/weblayer/shell/android/BUILD.gn
+++ b/weblayer/shell/android/BUILD.gn
@@ -45,7 +45,7 @@
"//components/strictmode/android:java",
"//third_party/android_deps:android_support_v4_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//weblayer/public/java",
]
sources = [
diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn
index adba868..8f0ed3ad 100644
--- a/weblayer/test/BUILD.gn
+++ b/weblayer/test/BUILD.gn
@@ -44,8 +44,8 @@
"//content/public/test/android:content_java_test_support",
"//testing/android/native_test:native_test_java",
"//third_party/android_deps:android_support_v4_java",
- "//third_party/android_deps:androidx_annotation_annotation_java",
- "//third_party/android_deps:androidx_core_core_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/androidx:androidx_core_core_java",
"//ui/android:ui_java",
"//weblayer/browser/java",
"//weblayer/browser/java:base_module_interfaces_java",