Merge identity_credentials_public_impl_java into content_java
This target used to be overridden internally, but no longer is.
Bug: 40901855
Change-Id: Iadf8083a5cd39f2372e920df07324ee7889e820c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5905744
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1364362}
diff --git a/android_webview/variables.gni b/android_webview/variables.gni
index f82d15a..f6e89f0 100644
--- a/android_webview/variables.gni
+++ b/android_webview/variables.gni
@@ -16,7 +16,6 @@
upstream_only_webview_deps = [
"//android_webview:platform_service_bridge_upstream_implementation_java",
"//android_webview/nonembedded:icon_resources",
- "//content/public/android:identity_credentials_public_impl_java",
]
webview_product_config_java_package = "org.chromium.android_webview"
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 4b3f95e..bf5bbaabf 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -296,7 +296,6 @@
"//chrome/browser/touch_to_fill/password_manager/android/internal:resource_provider_public_impl_java",
"//chrome/browser/ui/android/hats/internal:provider_public_impl_java",
"//chrome/browser/webauthn/android:recommender_public_java",
- "//content/public/android:identity_credentials_public_impl_java",
]
}
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 3902ad3..b1ab5a7b 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -499,14 +499,7 @@
]
asset_deps += [ "//chrome/android:chrome_public_non_pak_assets" ]
}
- if (_is_bundle) {
- if (_is_monochrome) {
- # WebView needs these in the base module.
- deps += [
- "//content/public/android:identity_credentials_public_impl_java",
- ]
- }
- } else {
+ if (!_is_bundle) {
deps += [
"//chrome/android:chrome_all_java",
"//chrome/android:delegate_public_impl_java",
diff --git a/chrome/browser/webid/BUILD.gn b/chrome/browser/webid/BUILD.gn
index 65e048a..919cfe3a 100644
--- a/chrome/browser/webid/BUILD.gn
+++ b/chrome/browser/webid/BUILD.gn
@@ -10,7 +10,6 @@
deps = [
"//base:base_java",
"//content/public/android:content_java",
- "//content/public/android:identity_credentials_public_impl_java",
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/jni_zero:jni_zero_java",
"//ui/android:ui_no_recycler_view_java",
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index d9f34c6..376559b 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -160,6 +160,7 @@
"$google_play_services_package:google_play_services_auth_api_phone_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
+ "$google_play_services_package:google_play_services_identity_credentials_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:process_launcher_java",
@@ -355,6 +356,7 @@
"java/src/org/chromium/content/browser/webcontents/EmptyInternalAccessDelegate.java",
"java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
"java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
+ "java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java",
"java/src/org/chromium/content_public/browser/ActionModeCallback.java",
"java/src/org/chromium/content_public/browser/ActionModeCallbackHelper.java",
"java/src/org/chromium/content_public/browser/AdditionalNavigationParams.java",
@@ -418,18 +420,6 @@
"java/src/org/chromium/content_public/browser/selection/SelectionActionMenuDelegate.java",
"java/src/org/chromium/content_public/browser/selection/SelectionDropdownMenuDelegate.java",
]
-
- public_deps = [ ":identity_credentials_public_impl_java" ]
-}
-
-android_library("identity_credentials_public_impl_java") {
- sources = [ "java/src/org/chromium/content/browser/webid/IdentityCredentialsDelegate.java" ]
- deps = [
- "$google_play_services_package:google_play_services_identity_credentials_java",
- "$google_play_services_package:google_play_services_tasks_java",
- "//base:base_java",
- "//third_party/androidx:androidx_core_core_java",
- ]
}
android_library("content_util_java") {
@@ -723,7 +713,6 @@
deps = [
":content_java",
- ":identity_credentials_public_impl_java",
"//base:base_java",
"//base:base_java_process_launcher_test_support",
"//base:base_java_test_support",
