Patches for 138 (final)
This commit is contained in:
Carmelo Messina
@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
build/config/android/config.gni | 4 +-
|
||||
chrome/android/BUILD.gn | 32 +-
|
||||
chrome/android/chrome_java_sources.gni | 5 -
|
||||
chrome/android/java/AndroidManifest.xml | 50 ---
|
||||
chrome/android/java/AndroidManifest.xml | 50 --
|
||||
.../browser/ChromeBackgroundService.java | 11 +-
|
||||
.../browser/PlayServicesVersionInfo.java | 12 +-
|
||||
.../ChromeBackgroundTaskFactory.java | 3 -
|
||||
@@ -37,14 +37,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
chrome/android/javatests/BUILD.gn | 7 -
|
||||
chrome/android/junit/BUILD.gn | 6 -
|
||||
chrome/browser/language/android/BUILD.gn | 3 -
|
||||
.../language/AppLanguagePromoDialog.java | 31 --
|
||||
.../language/AppLanguagePromoDialog.java | 31 -
|
||||
.../language/settings/LanguageSettings.java | 6 -
|
||||
chrome/browser/omaha/android/BUILD.gn | 1 -
|
||||
.../browser/password_manager/android/BUILD.gn | 5 -
|
||||
.../password_manager/GmsUpdateLauncher.java | 28 --
|
||||
.../PasswordManagerAndroidBackendUtil.java | 38 +--
|
||||
.../password_manager/GmsUpdateLauncher.java | 28 -
|
||||
.../PasswordManagerAndroidBackendUtil.java | 38 +-
|
||||
.../PasswordManagerHelper.java | 9 -
|
||||
...swordSyncControllerDelegateBridgeImpl.java | 7 -
|
||||
.../android/one_time_passwords/BUILD.gn | 2 -
|
||||
.../AndroidSmsOtpFetchReceiverBridge.java | 6 +-
|
||||
.../AndroidSmsOtpFetcher.java | 4 +-
|
||||
.../push_messaging_service_factory.cc | 8 +-
|
||||
.../notification_telemetry_service.cc | 1 +
|
||||
chrome/browser/ui/BUILD.gn | 3 -
|
||||
@@ -53,44 +56,46 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
chrome/browser/ui/webauthn/sheet_models.cc | 9 +-
|
||||
.../browser/ui/webui/chrome_web_ui_configs.cc | 1 -
|
||||
chrome/browser/webauthn/android/BUILD.gn | 1 -
|
||||
.../CableAuthenticatorModuleProvider.java | 35 +--
|
||||
.../CableAuthenticatorModuleProvider.java | 35 +-
|
||||
chrome/browser/webauthn/cablev2_devices.cc | 3 +
|
||||
...igitalCredentialsPresentationDelegate.java | 88 +-----
|
||||
chrome/browser/webid/BUILD.gn | 3 -
|
||||
.../DigitalCredentialsCreationDelegate.java | 112 ----
|
||||
...igitalCredentialsPresentationDelegate.java | 88 +--
|
||||
chrome/test/android/BUILD.gn | 2 -
|
||||
.../ExternalNavigationHandler.java | 8 -
|
||||
components/externalauth/android/BUILD.gn | 3 -
|
||||
.../externalauth/ExternalAuthUtils.java | 34 +--
|
||||
.../externalauth/ExternalAuthUtils.java | 34 +-
|
||||
.../UserRecoverableErrorHandler.java | 8 -
|
||||
.../gcm_driver/GoogleCloudMessagingV2.java | 2 +
|
||||
components/gcm_driver/gcm_client_impl.cc | 4 +
|
||||
.../gcm_driver/instance_id/android/BUILD.gn | 3 -
|
||||
.../instance_id/InstanceIDBridge.java | 56 +---
|
||||
.../instance_id/InstanceIDBridge.java | 56 +-
|
||||
.../InstalledAppProviderImpl.java | 2 +-
|
||||
.../media_router/browser/android/BUILD.gn | 11 -
|
||||
.../media_router/BrowserMediaRouter.java | 21 +-
|
||||
.../components/media_router/MediaSink.java | 44 +--
|
||||
.../media_router/MediaStatusBridge.java | 40 +--
|
||||
.../caf/BaseNotificationController.java | 59 ----
|
||||
.../caf/BaseSessionController.java | 112 +------
|
||||
.../caf/CafBaseMediaRouteProvider.java | 113 +------
|
||||
.../caf/CafMediaRouteProvider.java | 21 --
|
||||
.../media_router/caf/CafMessageHandler.java | 106 +------
|
||||
.../components/media_router/MediaSink.java | 44 +-
|
||||
.../media_router/MediaStatusBridge.java | 40 +-
|
||||
.../caf/BaseNotificationController.java | 59 --
|
||||
.../caf/BaseSessionController.java | 112 +---
|
||||
.../caf/CafBaseMediaRouteProvider.java | 113 +---
|
||||
.../caf/CafMediaRouteProvider.java | 21 -
|
||||
.../media_router/caf/CafMessageHandler.java | 106 +---
|
||||
.../media_router/caf/CastMediaSource.java | 10 +-
|
||||
.../media_router/caf/CastOptionsProvider.java | 21 +-
|
||||
.../caf/CastSessionController.java | 87 ------
|
||||
.../caf/CastSessionController.java | 87 ---
|
||||
.../media_router/caf/CastUtils.java | 8 -
|
||||
.../CafExpandedControllerActivity.java | 46 +--
|
||||
.../CafExpandedControllerActivity.java | 46 +-
|
||||
.../CafRemotingMediaRouteProvider.java | 4 +-
|
||||
.../remoting/FlingingControllerAdapter.java | 96 ------
|
||||
.../remoting/FlingingControllerAdapter.java | 96 ---
|
||||
.../caf/remoting/RemotingMediaSource.java | 8 +-
|
||||
.../remoting/RemotingSessionController.java | 31 --
|
||||
.../remoting/RemotingSessionController.java | 31 -
|
||||
.../test/android/cast_emulator/BUILD.gn | 1 -
|
||||
components/module_installer/android/BUILD.gn | 4 -
|
||||
components/omnibox/common/BUILD.gn | 1 -
|
||||
.../components/omnibox/OmniboxFeatures.java | 8 -
|
||||
components/signin/public/android/BUILD.gn | 3 -
|
||||
components/webauthn/android/BUILD.gn | 15 +-
|
||||
.../webauthn/AuthenticatorImpl.java | 81 +----
|
||||
.../webauthn/AuthenticatorImpl.java | 81 +--
|
||||
.../webauthn/ConditionalUiState.java | 15 +
|
||||
.../components/webauthn/GmsCoreUtils.java | 28 +-
|
||||
.../webauthn/WebauthnModeProvider.java | 15 -
|
||||
@@ -104,12 +109,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
services/BUILD.gn | 10 -
|
||||
services/device/geolocation/BUILD.gn | 4 -
|
||||
services/shape_detection/BUILD.gn | 2 -
|
||||
third_party/android_deps/BUILD.gn | 286 +-----------------
|
||||
third_party/android_deps/BUILD.gn | 273 +--------
|
||||
third_party/android_deps/autorolled/BUILD.gn | 550 ------------------
|
||||
.../preconditions/javatests/BUILD.gn | 1 -
|
||||
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
|
||||
third_party/androidx/customizations.gni | 14 +-
|
||||
third_party/cardboard/BUILD.gn | 4 -
|
||||
85 files changed, 121 insertions(+), 1804 deletions(-)
|
||||
91 files changed, 124 insertions(+), 2465 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
|
||||
@@ -817,6 +823,70 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom
|
||||
PasswordSyncControllerDelegateBridgeImplJni.get()
|
||||
.onCredentialManagerError(mNativeDelegateBridgeImpl, error, apiErrorCode);
|
||||
}
|
||||
diff --git a/chrome/browser/password_manager/android/one_time_passwords/BUILD.gn b/chrome/browser/password_manager/android/one_time_passwords/BUILD.gn
|
||||
--- a/chrome/browser/password_manager/android/one_time_passwords/BUILD.gn
|
||||
+++ b/chrome/browser/password_manager/android/one_time_passwords/BUILD.gn
|
||||
@@ -47,7 +47,6 @@ android_library("java") {
|
||||
]
|
||||
|
||||
deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
"//base:base_java",
|
||||
"//build/android:build_java",
|
||||
"//chrome/browser/password_manager/android/one_time_passwords:sms_otp_fetching_interface_java",
|
||||
@@ -61,7 +60,6 @@ android_library("java") {
|
||||
|
||||
android_library("sms_otp_fetching_interface_java") {
|
||||
deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
"//base:base_java",
|
||||
"//base:service_loader_java",
|
||||
]
|
||||
diff --git a/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetchReceiverBridge.java b/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetchReceiverBridge.java
|
||||
--- a/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetchReceiverBridge.java
|
||||
+++ b/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetchReceiverBridge.java
|
||||
@@ -4,8 +4,6 @@
|
||||
|
||||
package org.chromium.chrome.browser.password_manager.one_time_passwords;
|
||||
|
||||
-import com.google.android.gms.common.api.ApiException;
|
||||
-
|
||||
import org.jni_zero.CalledByNative;
|
||||
import org.jni_zero.NativeMethods;
|
||||
|
||||
@@ -34,11 +32,11 @@ class AndroidSmsOtpFetchReceiverBridge {
|
||||
.onOtpValueRetrieved(mNativeReceiverBridge, otpValue);
|
||||
}
|
||||
|
||||
- void onOtpValueRetrievalError(ApiException exception) {
|
||||
+ void onOtpValueRetrievalError(Object exception) {
|
||||
if (mNativeReceiverBridge == 0) return;
|
||||
|
||||
AndroidSmsOtpFetchReceiverBridgeJni.get()
|
||||
- .onOtpValueRetrievalError(mNativeReceiverBridge, exception.getStatusCode());
|
||||
+ .onOtpValueRetrievalError(mNativeReceiverBridge, 500);
|
||||
}
|
||||
|
||||
@CalledByNative
|
||||
diff --git a/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetcher.java b/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetcher.java
|
||||
--- a/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetcher.java
|
||||
+++ b/chrome/browser/password_manager/android/one_time_passwords/java/src/org/chromium/chrome/browser/password_manager/one_time_passwords/AndroidSmsOtpFetcher.java
|
||||
@@ -3,8 +3,6 @@
|
||||
// found in the LICENSE file.
|
||||
package org.chromium.chrome.browser.password_manager.one_time_passwords;
|
||||
|
||||
-import com.google.android.gms.common.api.ApiException;
|
||||
-
|
||||
import org.chromium.base.Callback;
|
||||
import org.chromium.build.annotations.NullMarked;
|
||||
|
||||
@@ -17,5 +15,5 @@ public interface AndroidSmsOtpFetcher {
|
||||
* @param otpValueCallback Callback that is called on success with the fetched OTP value string.
|
||||
* @param failureCallback A callback that is called on failure for any reason.
|
||||
*/
|
||||
- void retrieveSmsOtp(Callback<String> otpValueCallback, Callback<ApiException> failureCallback);
|
||||
+ void retrieveSmsOtp(Callback<String> otpValueCallback, Callback<Object> failureCallback);
|
||||
}
|
||||
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc
|
||||
--- a/chrome/browser/push_messaging/push_messaging_service_factory.cc
|
||||
+++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
|
||||
@@ -1018,6 +1088,156 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth
|
||||
ScopedListPrefUpdate update(profile->GetPrefs(),
|
||||
kWebAuthnCablePairingsPrefName);
|
||||
|
||||
diff --git a/chrome/browser/webid/BUILD.gn b/chrome/browser/webid/BUILD.gn
|
||||
--- a/chrome/browser/webid/BUILD.gn
|
||||
+++ b/chrome/browser/webid/BUILD.gn
|
||||
@@ -13,8 +13,6 @@ android_library("java") {
|
||||
"android/java/src/org/chromium/chrome/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",
|
||||
"//base:service_loader_java",
|
||||
"//content/public/android:content_java",
|
||||
@@ -43,7 +41,6 @@ robolectric_library("junit") {
|
||||
|
||||
deps = [
|
||||
":java",
|
||||
- "$google_play_services_package:google_play_services_identity_credentials_java",
|
||||
"//base:base_junit_test_support",
|
||||
"//content/public/android:content_java",
|
||||
"//third_party/junit:junit",
|
||||
diff --git a/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsCreationDelegate.java b/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsCreationDelegate.java
|
||||
--- a/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsCreationDelegate.java
|
||||
+++ b/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsCreationDelegate.java
|
||||
@@ -21,10 +21,6 @@ import androidx.credentials.exceptions.CreateCredentialException;
|
||||
import androidx.credentials.exceptions.CreateCredentialUnknownException;
|
||||
import androidx.credentials.provider.PendingIntentHandler;
|
||||
|
||||
-import com.google.android.gms.identitycredentials.CreateCredentialRequest;
|
||||
-import com.google.android.gms.identitycredentials.IdentityCredentialClient;
|
||||
-import com.google.android.gms.identitycredentials.IdentityCredentialManager;
|
||||
-
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
@@ -49,115 +45,7 @@ public class DigitalCredentialsCreationDelegate {
|
||||
|
||||
@OptIn(markerClass = androidx.credentials.ExperimentalDigitalCredentialApi.class)
|
||||
public Promise<DigitalCredential> create(Activity window, String origin, String request) {
|
||||
- final IdentityCredentialClient client =
|
||||
- IdentityCredentialManager.Companion.getClient(window);
|
||||
-
|
||||
final Promise<DigitalCredential> result = new Promise<DigitalCredential>();
|
||||
-
|
||||
- ResultReceiver resultReceiver =
|
||||
- new ResultReceiver(new Handler(Looper.getMainLooper())) {
|
||||
- @Override
|
||||
- protected void onReceiveResult(int code, Bundle data) {
|
||||
- if (!result.isPending()) {
|
||||
- // Promises don't support duplicate calls to fulfill/reject. If the
|
||||
- // promise has been fulfilled/rejected already (e.g. due to erroneous
|
||||
- // exception during the API call), return immediately.
|
||||
- return;
|
||||
- }
|
||||
- Log.d(TAG, "Received a response");
|
||||
- Intent providerData =
|
||||
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
|
||||
- ? data.getParcelable(BUNDLE_KEY_PROVIDER_DATA, Intent.class)
|
||||
- : data.getParcelable(BUNDLE_KEY_PROVIDER_DATA);
|
||||
-
|
||||
- if (providerData == null) {
|
||||
- Log.d(TAG, "Response doesn't contain providerData");
|
||||
- result.reject(
|
||||
- new CreateCredentialUnknownException(
|
||||
- "Response doesn't contain providerData"));
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- var response =
|
||||
- PendingIntentHandler.retrieveCreateCredentialResponse(
|
||||
- TYPE_DIGITAL_CREDENTIAL, providerData);
|
||||
- if (response == null) {
|
||||
- CreateCredentialException exception =
|
||||
- PendingIntentHandler.retrieveCreateCredentialException(
|
||||
- providerData);
|
||||
- result.reject(
|
||||
- exception == null
|
||||
- ? new CreateCredentialUnknownException("empty response")
|
||||
- : exception);
|
||||
- return;
|
||||
- }
|
||||
- String responseJson =
|
||||
- response.getData()
|
||||
- .getString("androidx.credentials.BUNDLE_KEY_RESPONSE_JSON");
|
||||
- if (responseJson == null) {
|
||||
- result.reject(
|
||||
- new CreateCredentialUnknownException(
|
||||
- "Response doesn't contain responseJson"));
|
||||
- return;
|
||||
- }
|
||||
- Log.d(TAG, "Response JSON: " + responseJson);
|
||||
-
|
||||
- DigitalCredential digitalCredential = parseResponse(responseJson);
|
||||
- if (digitalCredential == null) {
|
||||
- result.reject(
|
||||
- new CreateCredentialUnknownException(
|
||||
- "Failed to parse response"));
|
||||
- return;
|
||||
- }
|
||||
- result.fulfill(digitalCredential);
|
||||
- }
|
||||
- };
|
||||
-
|
||||
- Bundle requestBundle = new Bundle();
|
||||
- requestBundle.putString("androidx.credentials.BUNDLE_KEY_REQUEST_JSON", request);
|
||||
- CreateCredentialRequest createRequest =
|
||||
- new CreateCredentialRequest(
|
||||
- TYPE_DIGITAL_CREDENTIAL,
|
||||
- /* credentialData= */ requestBundle,
|
||||
- /* candidateQueryData= */ new Bundle(),
|
||||
- origin,
|
||||
- request,
|
||||
- resultReceiver);
|
||||
-
|
||||
- client.createCredential(createRequest)
|
||||
- .addOnSuccessListener(
|
||||
- response -> {
|
||||
- if (response.getPendingIntent() == null) {
|
||||
- Log.d(TAG, "Response doesn't contain pendingIntent");
|
||||
- result.reject(
|
||||
- new CreateCredentialUnknownException(
|
||||
- "Response doesn't contain pendingIntent"));
|
||||
- return;
|
||||
- }
|
||||
- try {
|
||||
- Log.d(TAG, "Sending an intent for sender");
|
||||
- Log.d(TAG, request);
|
||||
- startIntentSenderForResult(
|
||||
- /* activity= */ window,
|
||||
- /* intent= */ response.getPendingIntent().getIntentSender(),
|
||||
- /* requestCode= */ REQUEST_CODE_DIGITAL_CREDENTIALS_CREATION,
|
||||
- /* fillInIntent= */ null,
|
||||
- /* flagsMask= */ 0,
|
||||
- /* flagsValues= */ 0,
|
||||
- /* extraFlags= */ 0,
|
||||
- /* options= */ null);
|
||||
- } catch (SendIntentException e) {
|
||||
- Log.e(TAG, "Sending an intent for sender failed");
|
||||
- if (result.isPending()) {
|
||||
- result.reject(e);
|
||||
- }
|
||||
- }
|
||||
- })
|
||||
- .addOnFailureListener(
|
||||
- e -> {
|
||||
- result.reject(new CreateCredentialUnknownException("unknown error"));
|
||||
- });
|
||||
-
|
||||
return result;
|
||||
}
|
||||
|
||||
diff --git a/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsPresentationDelegate.java b/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsPresentationDelegate.java
|
||||
--- a/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsPresentationDelegate.java
|
||||
+++ b/chrome/browser/webid/android/java/src/org/chromium/chrome/browser/webid/DigitalCredentialsPresentationDelegate.java
|
||||
@@ -3659,27 +3879,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
|
||||
}
|
||||
|
||||
# The section below is generated by running
|
||||
@@ -153,19 +144,6 @@ java_prebuilt("com_android_tools_sdk_common_java") {
|
||||
visibility = [ "//build/android/unused_resources:*" ]
|
||||
}
|
||||
|
||||
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
-java_prebuilt("com_google_code_gson_gson_java") {
|
||||
- jar_path = "cipd/libs/com_google_code_gson_gson/gson-2.8.0.jar"
|
||||
- output_name = "com_google_code_gson_gson"
|
||||
- enable_bytecode_checks = false
|
||||
-}
|
||||
-
|
||||
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
-java_prebuilt("com_squareup_javapoet_java") {
|
||||
- jar_path = "cipd/libs/com_squareup_javapoet/javapoet-1.13.0.jar"
|
||||
- output_name = "com_squareup_javapoet"
|
||||
- enable_bytecode_checks = false
|
||||
-}
|
||||
if (!limit_android_deps) {
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("com_android_support_support_annotations_java") {
|
||||
@@ -233,94 +211,6 @@ if (!limit_android_deps) {
|
||||
@@ -233,94 +224,6 @@ if (!limit_android_deps) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3774,7 +3974,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
|
||||
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("com_googlecode_java_diff_utils_diffutils_java") {
|
||||
@@ -500,180 +390,6 @@ if (!limit_android_deps) {
|
||||
@@ -500,180 +403,6 @@ if (!limit_android_deps) {
|
||||
deps = [ ":org_mockito_mockito_core_java" ]
|
||||
}
|
||||
|
||||
@@ -3955,6 +4155,594 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("jakarta_inject_jakarta_inject_api_java") {
|
||||
jar_path = "cipd/libs/jakarta_inject_jakarta_inject_api/jakarta.inject-api-2.0.1.jar"
|
||||
diff --git a/third_party/android_deps/autorolled/BUILD.gn b/third_party/android_deps/autorolled/BUILD.gn
|
||||
--- a/third_party/android_deps/autorolled/BUILD.gn
|
||||
+++ b/third_party/android_deps/autorolled/BUILD.gn
|
||||
@@ -139,342 +139,6 @@ template("define_autorolled_targets") {
|
||||
deps = [ "//third_party/android_deps:org_ow2_asm_asm_tree_java" ]
|
||||
}
|
||||
if (!limit_android_deps) {
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt(
|
||||
- "google_android_datatransport_transport_backend_cct_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_datatransport_transport_backend_cct/transport-backend-cct-4.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_datatransport_transport_backend_cct/com_google_android_datatransport_transport_backend_cct.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_java",
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_json_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_api_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_runtime_java",
|
||||
- "//third_party/androidx:androidx_annotation_annotation_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_auth_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_auth/play-services-auth-21.3.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_auth_api_phone_java",
|
||||
- "$google_play_services_package:google_play_services_auth_base_java",
|
||||
- "$google_play_services_package:google_play_services_base_java",
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- "$google_play_services_package:google_play_services_fido_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/androidx:androidx_fragment_fragment_java",
|
||||
- "//third_party/androidx:androidx_loader_loader_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_auth_api_phone_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-18.2.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_auth_api_phone/com_google_android_gms_play_services_auth_api_phone.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_core_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_play_services_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_auth_base_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-18.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_auth_blockstore_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_auth_blockstore/play-services-auth-blockstore-16.4.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_auth_blockstore/com_google_android_gms_play_services_auth_blockstore.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_base_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_base/play-services-base-18.7.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- "//third_party/androidx:androidx_fragment_fragment_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_basement_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_basement/play-services-basement-18.7.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- "//third_party/androidx:androidx_fragment_fragment_java",
|
||||
- ]
|
||||
-
|
||||
- jar_excluded_patterns = []
|
||||
- if (!enable_java_asserts) {
|
||||
- # Omit the file since we use our own copy.
|
||||
- jar_excluded_patterns +=
|
||||
- [ "com/google/android/gms/common/internal/Preconditions.class" ]
|
||||
- deps += [ "//third_party/android_deps/local_modifications/preconditions:gms_stub_preconditions_java" ]
|
||||
- }
|
||||
-
|
||||
- # https://crbug.com/989505
|
||||
- jar_excluded_patterns += [ "META-INF/proguard/*" ]
|
||||
- input_jars_paths =
|
||||
- [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_cast_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_cast/play-services-cast-22.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_flags_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- "//third_party/androidx:androidx_mediarouter_mediarouter_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_cast_framework_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_cast_framework/play-services-cast-framework-22.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_cast_framework/com_google_android_gms_play_services_cast_framework.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_cast_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_api_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_backend_cct_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_runtime_java",
|
||||
- "//third_party/android_deps:guava_android_java",
|
||||
- "//third_party/androidx:androidx_appcompat_appcompat_java",
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- "//third_party/androidx:androidx_concurrent_concurrent_futures_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_recyclerview_recyclerview_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_fido_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_fido/play-services-fido-21.2.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_core_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_gcm_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_iid_java",
|
||||
- "$google_play_services_package:google_play_services_stats_java",
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- "//third_party/androidx:androidx_legacy_legacy_support_core_utils_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_identity_credentials_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_identity_credentials/play-services-identity-credentials-16.0.0-alpha07.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_identity_credentials/com_google_android_gms_play_services_identity_credentials.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_iid_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_iid/play-services-iid-17.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_stats_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/androidx:androidx_collection_collection_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_instantapps_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_instantapps/play-services-instantapps-18.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_instantapps/com_google_android_gms_play_services_instantapps.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_location_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_location/play-services-location-21.3.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_location/com_google_android_gms_play_services_location.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_android_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_core_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_stats_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_stats/play-services-stats-17.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_stats/com_google_android_gms_play_services_stats.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- "//third_party/androidx:androidx_legacy_legacy_support_core_utils_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_tasks_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_tasks/play-services-tasks-18.3.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_vision_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_vision/play-services-vision-20.1.3.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_vision_common_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_vision_common_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_vision_common/play-services-vision-common-19.1.3.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_vision_common/com_google_android_gms_play_services_vision_common.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$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_clearcut_java",
|
||||
- "$google_play_services_package:google_play_services_flags_java",
|
||||
- "$google_play_services_package:google_play_services_phenotype_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- android_aar_prebuilt(
|
||||
- "com_google_android_libraries_identity_googleid_googleid_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_libraries_identity_googleid_googleid/googleid-1.1.1.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_libraries_identity_googleid_googleid/com_google_android_libraries_identity_googleid_googleid.info"
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "//third_party/androidx:androidx_credentials_credentials_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
if (!defined(material_design_target)) {
|
||||
android_aar_prebuilt("com_google_android_material_material_java") {
|
||||
@@ -523,24 +187,6 @@ template("define_autorolled_targets") {
|
||||
}
|
||||
}
|
||||
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (!defined(playcore_target)) {
|
||||
- android_aar_prebuilt("com_google_android_play_feature_delivery_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_play_feature_delivery/feature-delivery-2.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_play_feature_delivery/com_google_android_play_feature_delivery.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # Target is swapped out when internal code is enabled.
|
||||
- # Please depend on //third_party/android_deps:playcore_java instead.
|
||||
- visibility = [ "//third_party/android_deps:*" ]
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/android_deps:com_google_android_play_core_common_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("com_google_code_findbugs_jsr305_java") {
|
||||
jar_path = "autorolled/cipd/libs/com_google_code_findbugs_jsr305/jsr305-3.0.2.jar"
|
||||
@@ -642,21 +288,6 @@ template("define_autorolled_targets") {
|
||||
deps = [ "//third_party/kotlin_stdlib:kotlin_stdlib_java" ]
|
||||
}
|
||||
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- java_prebuilt(
|
||||
- "org_jetbrains_kotlinx_kotlinx_coroutines_play_services_java") {
|
||||
- jar_path = "autorolled/cipd/libs/org_jetbrains_kotlinx_kotlinx_coroutines_play_services/kotlinx-coroutines-play-services-1.10.1.jar"
|
||||
- output_name = "org_jetbrains_kotlinx_kotlinx_coroutines_play_services"
|
||||
- supports_android = true
|
||||
- requires_android = true
|
||||
- enable_bytecode_checks = false
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/android_deps:org_jetbrains_kotlinx_kotlinx_coroutines_core_java",
|
||||
- "//third_party/kotlin_stdlib:kotlin_stdlib_java",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("org_jetbrains_kotlinx_kotlinx_serialization_core_jvm_java") {
|
||||
jar_path = "autorolled/cipd/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm/kotlinx-serialization-core-jvm-1.7.2.jar"
|
||||
@@ -695,126 +326,6 @@ template("define_autorolled_targets") {
|
||||
]
|
||||
}
|
||||
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_android_datatransport_transport_api_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_datatransport_transport_api/transport-api-4.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_datatransport_transport_api/com_google_android_datatransport_transport_api.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt(
|
||||
- "google_android_datatransport_transport_runtime_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_datatransport_transport_runtime/transport-runtime-4.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_datatransport_transport_runtime/com_google_android_datatransport_transport_runtime.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_java",
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_proto_java",
|
||||
- "//third_party/android_deps:google_android_datatransport_transport_api_java",
|
||||
- "//third_party/android_deps:javax_inject_javax_inject_java",
|
||||
- "//third_party/androidx:androidx_annotation_annotation_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_clearcut_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_clearcut/play-services-clearcut-17.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$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_phenotype_java",
|
||||
- "$google_play_services_package:google_play_services_tasks_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_flags_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_flags/play-services-flags-18.1.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_play_services_base_java",
|
||||
- "$google_play_services_package:google_play_services_basement_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_play_services_phenotype_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-17.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$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_tasks_java",
|
||||
- "//third_party/androidx:androidx_core_core_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- android_aar_prebuilt("com_google_android_play_core_common_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_android_play_core_common/core-common-2.0.3.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_android_play_core_common/com_google_android_play_core_common.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt("com_google_auto_value_auto_value_annotations_java") {
|
||||
jar_path = "autorolled/cipd/libs/com_google_auto_value_auto_value_annotations/auto-value-annotations-1.11.0.jar"
|
||||
@@ -831,67 +342,6 @@ template("define_autorolled_targets") {
|
||||
testonly = true
|
||||
}
|
||||
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- java_prebuilt("google_firebase_firebase_encoders_java") {
|
||||
- jar_path = "autorolled/cipd/libs/com_google_firebase_firebase_encoders/firebase-encoders-17.0.0.jar"
|
||||
- output_name = "com_google_firebase_firebase_encoders"
|
||||
- supports_android = true
|
||||
- requires_android = true
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- android_aar_prebuilt("google_firebase_firebase_encoders_json_java") {
|
||||
- aar_path = "autorolled/cipd/libs/com_google_firebase_firebase_encoders_json/firebase-encoders-json-18.0.0.aar"
|
||||
- info_path = "autorolled/committed/libs/com_google_firebase_firebase_encoders_json/com_google_firebase_firebase_encoders_json.info"
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_java",
|
||||
- "//third_party/androidx:androidx_annotation_annotation_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
- if (google_play_services_package == "//third_party/android_deps") {
|
||||
- java_prebuilt("google_firebase_firebase_encoders_proto_java") {
|
||||
- jar_path = "autorolled/cipd/libs/com_google_firebase_firebase_encoders_proto/firebase-encoders-proto-16.0.0.jar"
|
||||
- output_name = "com_google_firebase_firebase_encoders_proto"
|
||||
- supports_android = true
|
||||
- requires_android = true
|
||||
- enable_bytecode_checks = false
|
||||
-
|
||||
- # To remove visibility constraint, add this dependency to
|
||||
- # //third_party/android_deps/autorolled/build.gradle.
|
||||
- visibility = [
|
||||
- ":*",
|
||||
- "//third_party/androidx:*",
|
||||
- ]
|
||||
- deps = [
|
||||
- "$google_play_services_package:google_firebase_firebase_encoders_java",
|
||||
- "//third_party/androidx:androidx_annotation_annotation_java",
|
||||
- ]
|
||||
- }
|
||||
- }
|
||||
-
|
||||
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
|
||||
java_prebuilt(
|
||||
"com_google_testparameterinjector_test_parameter_injector_java") {
|
||||
diff --git a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
|
||||
--- a/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
|
||||
+++ b/third_party/android_deps/local_modifications/preconditions/javatests/BUILD.gn
|
||||
|
||||
Reference in New Issue
Block a user