Skip to content

Commit

Permalink
Removed the androidx.credentials.play.services.auth library
Browse files Browse the repository at this point in the history
Since third_party/androidx/cipd/BUILD.gn is excluded from git, editing the gn that produces that file is required.
  • Loading branch information
uazo committed Jan 10, 2025
1 parent 72c7b0c commit 4aa2916
Showing 1 changed file with 32 additions and 1 deletion.
33 changes: 32 additions & 1 deletion build/patches/Remove-binary-blob-integrations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
third_party/android_deps/BUILD.gn | 764 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
third_party/androidx/customizations.gni | 13 +-
third_party/cardboard/BUILD.gn | 4 -
83 files changed, 117 insertions(+), 2358 deletions(-)
84 files changed, 129 insertions(+), 2359 deletions(-)
create mode 100644 components/webauthn/android/java/src/org/chromium/components/webauthn/ConditionalUiState.java

diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
Expand Down Expand Up @@ -4636,6 +4637,36 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
+ return 16; // API_UNAVAILABLE
}
}
diff --git a/third_party/androidx/customizations.gni b/third_party/androidx/customizations.gni
--- a/third_party/androidx/customizations.gni
+++ b/third_party/androidx/customizations.gni
@@ -126,7 +126,7 @@ template("androidx_java_prebuilt") {
}
}

-template("androidx_android_aar_prebuilt") {
+template("androidx_android_aar_prebuilt_cromite") {
_androidx_prebuilt(target_name) {
forward_variables_from(invoker, "*")
target_type = "android_aar_prebuilt"
@@ -142,6 +142,17 @@ template("androidx_android_aar_prebuilt") {
}
}

+template("androidx_android_aar_prebuilt") {
+ if (target_name == "androidx_credentials_credentials_play_services_auth_java") {
+ forward_variables_from(invoker, "*")
+ not_needed(["deps", "aar_path", "info_path", "enable_bytecode_checks"])
+ } else {
+ androidx_android_aar_prebuilt_cromite(target_name) {
+ forward_variables_from(invoker, "*")
+ }
+ }
+}
+
template("androidx_java_group") {
_androidx_prebuilt(target_name) {
forward_variables_from(invoker, "*")
diff --git a/third_party/cardboard/BUILD.gn b/third_party/cardboard/BUILD.gn
--- a/third_party/cardboard/BUILD.gn
+++ b/third_party/cardboard/BUILD.gn
Expand Down

0 comments on commit 4aa2916

Please sign in to comment.