From 0c849a22b205748667652580760351f9a1a6a249 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Mon, 23 Oct 2023 11:20:33 -0400 Subject: [PATCH] [Android] Migrating all JNI annotations in /base to jni_zero copies Chromium change: https://source.chromium.org/chromium/chromium/src/+/c45bc648b3616610b5c2a19ea5060492dc1cb24b jni_zero: Migrating all JNI annotations in /base to jni_zero copies This CL is the result of a few simple sed commands, switching any import statement using any of the 6 JNI annotations, and switching over the gn targets from base:jni_java to jni_zero_java. This CL was uploaded by git cl split. Bug: 1456762 --- .../java/org/chromium/chrome/browser/BraveFeatureUtil.java | 4 ++-- .../java/org/chromium/chrome/browser/BraveLocalState.java | 4 ++-- .../org/chromium/chrome/browser/BraveRelaunchUtils.java | 4 ++-- .../org/chromium/chrome/browser/BraveRewardsHelper.java | 2 +- .../chromium/chrome/browser/BraveRewardsNativeWorker.java | 6 +++--- .../java/org/chromium/chrome/browser/BraveSyncWorker.java | 6 +++--- .../java/org/chromium/chrome/browser/app/BraveActivity.java | 4 ++-- .../chrome/browser/bookmarks/BraveBookmarkBridge.java | 4 ++-- .../browser/brave_leo/BraveLeoSettingsLauncherHelper.java | 2 +- .../browser/brave_news/BraveNewsControllerFactory.java | 4 ++-- .../browser/crypto_wallet/AssetRatioServiceFactory.java | 4 ++-- .../browser/crypto_wallet/BlockchainRegistryFactory.java | 4 ++-- .../BraveWalletProviderDelegateImplHelper.java | 6 +++--- .../browser/crypto_wallet/BraveWalletServiceFactory.java | 4 ++-- .../chrome/browser/crypto_wallet/JsonRpcServiceFactory.java | 4 ++-- .../chrome/browser/crypto_wallet/KeyringServiceFactory.java | 4 ++-- .../chrome/browser/crypto_wallet/SwapServiceFactory.java | 4 ++-- .../chrome/browser/crypto_wallet/TxServiceFactory.java | 4 ++-- .../fragments/dapps/ConnectAccountFragment.java | 4 ++-- .../permission/BraveDappPermissionPromptDialog.java | 4 ++-- .../crypto_wallet/util/WalletDataFilesInstallerUtil.java | 2 +- .../browser/crypto_wallet/util/WalletNativeUtils.java | 4 ++-- .../browser/informers/BraveSyncAccountDeletedInformer.java | 2 +- .../browser/misc_metrics/MiscAndroidMetricsFactory.java | 4 ++-- .../notifications/BraveNotificationPlatformBridge.java | 2 +- .../notifications/BraveNotificationSettingsBridge.java | 2 +- .../ntp_background_images/NTPBackgroundImagesBridge.java | 4 ++-- .../browser/playlist/PlaylistServiceFactoryAndroid.java | 4 ++-- .../chrome/browser/preferences/BravePrefServiceBridge.java | 4 ++-- .../preferences/website/BraveShieldsContentSettings.java | 6 +++--- .../settings/BraveSearchEnginePrefHelper.java | 2 +- .../browser/settings/developer/BraveQAPreferences.java | 2 +- .../chrome/browser/shields/FilterListServiceFactory.java | 4 ++-- .../chrome/browser/shields/UrlSanitizerServiceFactory.java | 4 ++-- .../chromium/chrome/browser/signin/BraveSigninManager.java | 2 +- .../chrome/browser/speedreader/BraveSpeedReaderUtils.java | 4 ++-- .../org/chromium/chrome/browser/sync/BraveSyncDevices.java | 6 +++--- .../org/chromium/chrome/browser/util/BraveReferrer.java | 6 +++--- .../chromium/chrome/browser/vpn/BraveVpnNativeWorker.java | 6 +++--- .../org/chromium/chrome/browser/BraveAdsNativeHelper.java | 4 ++-- .../chrome/browser/device_id/DeviceIdImplAndroid.java | 4 ++-- .../chrome/browser/dialogs/BraveAdsNotificationDialog.java | 2 +- .../chrome/browser/dialogs/BraveAdsSignupDialog.java | 2 +- .../org/chromium/chrome/browser/notifications/BraveAds.java | 2 +- .../chromium/chrome/browser/download/BraveMimeUtils.java | 2 +- build/android/bytecode/BUILD.gn | 1 - .../bytecode/java/org/brave/bytecode/BraveClassAdapter.java | 1 - .../permissions/BravePermissionDialogDelegate.java | 4 ++-- .../org/chromium/chrome/browser/util/SafetyNetCheck.java | 6 +++--- 49 files changed, 89 insertions(+), 91 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java b/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java index c7fef743ee3..14cc2eab9f1 100644 --- a/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java +++ b/android/java/org/chromium/chrome/browser/BraveFeatureUtil.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; @JNINamespace("chrome::android") public abstract class BraveFeatureUtil { diff --git a/android/java/org/chromium/chrome/browser/BraveLocalState.java b/android/java/org/chromium/chrome/browser/BraveLocalState.java index 40a59f83526..cc40106c28a 100644 --- a/android/java/org/chromium/chrome/browser/BraveLocalState.java +++ b/android/java/org/chromium/chrome/browser/BraveLocalState.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.components.prefs.PrefService; /** diff --git a/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java b/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java index 528e02ee537..5fc4089ad8a 100644 --- a/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java +++ b/android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java @@ -9,8 +9,8 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.R; @JNINamespace("chrome::android") diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index 75bdf83db43..91f5710b643 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -32,7 +32,7 @@ import android.view.View; import androidx.annotation.Nullable; import org.chromium.base.ContextUtils; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.customtabs.CustomTabActivity; diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index 17c265d844a..c9cbe5dc79c 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -13,9 +13,9 @@ import androidx.annotation.Nullable; import org.json.JSONException; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_rewards.mojom.PublisherStatus; import org.chromium.chrome.browser.tab.Tab; import org.chromium.components.embedder_support.util.UrlConstants; diff --git a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java index 93a1708661d..b96fe9bdc48 100644 --- a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java @@ -9,9 +9,9 @@ import android.content.Context; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; @JNINamespace("chrome::android") public class BraveSyncWorker { diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index a5dc3c48b86..6b11dfeddbd 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -52,8 +52,8 @@ import org.chromium.base.ContextUtils; import org.chromium.base.IntentUtils; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.UnownedUserDataSupplier; import org.chromium.base.task.PostTask; diff --git a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java index ae1be60c5bc..0b70aedf422 100644 --- a/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java +++ b/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser.bookmarks; import androidx.appcompat.app.AppCompatActivity; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.NativeMethods; import org.chromium.ui.base.WindowAndroid; class BraveBookmarkBridge extends BookmarkBridge { diff --git a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java index 76d868d16e9..74e6908bc01 100644 --- a/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java +++ b/android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.brave_leo; import android.content.Context; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.browser.settings.BraveLeoPreferences; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; import org.chromium.components.browser_ui.settings.SettingsLauncher; diff --git a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsControllerFactory.java b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsControllerFactory.java index 585714600e9..90601b48010 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsControllerFactory.java +++ b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsControllerFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.brave_news; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_news.mojom.BraveNewsController; import org.chromium.mojo.bindings.ConnectionErrorHandler; import org.chromium.mojo.bindings.Interface; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java index 352af19a931..7cfba8eff11 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.AssetRatioService; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/BlockchainRegistryFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/BlockchainRegistryFactory.java index 9f500e97d60..ae0d5e7835a 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/BlockchainRegistryFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/BlockchainRegistryFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.BlockchainRegistry; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletProviderDelegateImplHelper.java b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletProviderDelegateImplHelper.java index d820bbb7f1f..0918ed5d304 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletProviderDelegateImplHelper.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletProviderDelegateImplHelper.java @@ -7,9 +7,9 @@ package org.chromium.chrome.browser.crypto_wallet; import org.chromium.base.Callback; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.CoinType; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.settings.BraveWalletPreferences; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java index fe2042e5a77..401bd253a76 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.BraveWalletP3a; import org.chromium.brave_wallet.mojom.BraveWalletService; import org.chromium.chrome.browser.crypto_wallet.util.Utils; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/JsonRpcServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/JsonRpcServiceFactory.java index 8c1d8df8e04..617d00a000a 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/JsonRpcServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/JsonRpcServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.JsonRpcService; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/KeyringServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/KeyringServiceFactory.java index 57be10b0737..2133a2495ac 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/KeyringServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/KeyringServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.KeyringService; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/SwapServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/SwapServiceFactory.java index 9b6607e7ba2..5e2f69ead05 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/SwapServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/SwapServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.SwapService; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/TxServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/TxServiceFactory.java index 49cd769ad72..6e6a376c396 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/TxServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/TxServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.EthTxManagerProxy; import org.chromium.brave_wallet.mojom.SolanaTxManagerProxy; import org.chromium.brave_wallet.mojom.TxService; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java index c8172f49af8..5df9726fb72 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java @@ -22,8 +22,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import org.chromium.base.Callback; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.AccountInfo; import org.chromium.brave_wallet.mojom.CoinType; import org.chromium.brave_wallet.mojom.PermissionLifetimeOption; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java b/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java index c706b052f12..17f359a54df 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java @@ -20,8 +20,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.card.MaterialCardView; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.AccountInfo; import org.chromium.brave_wallet.mojom.BraveWalletService; import org.chromium.brave_wallet.mojom.CoinType; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java index 225e838fee2..cf9c8c5ac5e 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java @@ -5,7 +5,7 @@ package org.chromium.chrome.browser.crypto_wallet.util; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; /** * Class that is used by wallet_data_files_installer.cc to determine, if we need to download diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java index a1f93feb46d..af6a4f60866 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.crypto_wallet.util; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.profiles.Profile; @JNINamespace("chrome::android") diff --git a/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java b/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java index 7fee7291935..798dbace142 100644 --- a/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java +++ b/android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.informers; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveSyncWorker; import org.chromium.chrome.browser.app.BraveActivity; diff --git a/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java b/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java index 4da2fe7e246..9a114314aaa 100644 --- a/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java +++ b/android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.misc_metrics; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.misc_metrics.mojom.MiscAndroidMetrics; diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java index 62956d143ba..df238891209 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java @@ -13,7 +13,7 @@ import android.graphics.Bitmap; import org.chromium.base.ApplicationStatus; import org.chromium.base.ContextUtils; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; public class BraveNotificationPlatformBridge extends NotificationPlatformBridge { private static final int[] EMPTY_VIBRATION_PATTERN = new int[0]; diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java index 0fa984fda90..ab045ab5562 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java @@ -10,7 +10,7 @@ package org.chromium.chrome.browser.notifications; import android.annotation.TargetApi; import android.os.Build; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; /** * This class provides our native code to access NotificationSettingsBridge diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java b/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java index 0b58f405caa..a707014b4c9 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java @@ -9,8 +9,8 @@ import androidx.annotation.Nullable; import org.chromium.base.ObserverList; import org.chromium.base.ThreadUtils; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.ntp_background_images.model.BackgroundImage; import org.chromium.chrome.browser.ntp_background_images.model.ImageCredit; diff --git a/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java b/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java index 866041e12a4..ecf06b68fff 100644 --- a/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java +++ b/android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.playlist; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.mojo.bindings.ConnectionErrorHandler; diff --git a/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java b/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java index ed3dd102af4..031ed4a8deb 100644 --- a/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java +++ b/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java @@ -6,8 +6,8 @@ package org.chromium.chrome.browser.preferences; import org.chromium.base.ThreadUtils; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.profiles.Profile; /** diff --git a/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java b/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java index 3c7d2ef86d5..fa249df7e2d 100644 --- a/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java +++ b/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java @@ -5,9 +5,9 @@ package org.chromium.chrome.browser.preferences.website; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.profiles.Profile; import java.util.ArrayList; diff --git a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePrefHelper.java b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePrefHelper.java index 55870e033cb..89b898ce278 100644 --- a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePrefHelper.java +++ b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePrefHelper.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.search_engines.settings; import org.chromium.base.ThreadUtils; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.NativeMethods; public class BraveSearchEnginePrefHelper { private static BraveSearchEnginePrefHelper sInstance; diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java index a03a6ef4e9e..6d735c8ec06 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java @@ -26,7 +26,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import org.chromium.base.ContextUtils; import org.chromium.base.FileUtils; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveConfig; import org.chromium.chrome.browser.BraveRelaunchUtils; diff --git a/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java b/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java index 39bbbfc87a7..54fd4c5e77d 100644 --- a/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.shields; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.brave_shields.mojom.FilterListAndroidHandler; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; diff --git a/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java b/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java index db8b1d6344c..10c220ff643 100644 --- a/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.shields; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.crypto_wallet.util.Utils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.mojo.bindings.ConnectionErrorHandler; diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java index b0be07f1e6d..9cb396b3580 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java @@ -11,7 +11,7 @@ import androidx.annotation.MainThread; import androidx.annotation.Nullable; import org.chromium.base.Callback; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.browser.signin.services.SigninManager; import org.chromium.components.signin.base.CoreAccountId; import org.chromium.components.signin.base.CoreAccountInfo; diff --git a/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java b/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java index 5f231950676..13ec6d4f559 100644 --- a/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java +++ b/android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java @@ -5,8 +5,8 @@ package org.chromium.chrome.browser.speedreader; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.tab.Tab; import org.chromium.content_public.browser.WebContents; diff --git a/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java b/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java index 2b793e26ce8..029a458912e 100644 --- a/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java +++ b/android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java @@ -11,9 +11,9 @@ import org.json.JSONObject; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import java.util.ArrayList; import java.util.Date; diff --git a/android/java/org/chromium/chrome/browser/util/BraveReferrer.java b/android/java/org/chromium/chrome/browser/util/BraveReferrer.java index 5aa61483ab5..8a5345e15df 100644 --- a/android/java/org/chromium/chrome/browser/util/BraveReferrer.java +++ b/android/java/org/chromium/chrome/browser/util/BraveReferrer.java @@ -19,9 +19,9 @@ import com.android.installreferrer.api.ReferrerDetails; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java index 0b0fc950807..75de55a63e0 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java @@ -7,9 +7,9 @@ package org.chromium.chrome.browser.vpn; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import java.util.ArrayList; import java.util.List; diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/BraveAdsNativeHelper.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/BraveAdsNativeHelper.java index 6f4b525b052..24e1ecbb49a 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/BraveAdsNativeHelper.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/BraveAdsNativeHelper.java @@ -7,8 +7,8 @@ package org.chromium.chrome.browser; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.profiles.Profile; @JNINamespace("brave_ads") diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/device_id/DeviceIdImplAndroid.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/device_id/DeviceIdImplAndroid.java index fa66a7d905a..ed1eae7b1ae 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/device_id/DeviceIdImplAndroid.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/device_id/DeviceIdImplAndroid.java @@ -10,8 +10,8 @@ import android.content.Context; import android.provider.Settings; import org.chromium.base.ContextUtils; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; @JNINamespace("brave_ads") public class DeviceIdImplAndroid { diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java index 2c46e970467..6100b15eb3f 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsNotificationDialog.java @@ -24,7 +24,7 @@ import android.widget.TextView; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveAdsNativeHelper; import org.chromium.chrome.browser.ChromeTabbedActivity; diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java index 60e382d6574..034a1043b11 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/dialogs/BraveAdsSignupDialog.java @@ -21,7 +21,7 @@ import android.widget.ImageView; import org.chromium.base.ContextUtils; import org.chromium.base.IntentUtils; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.app.BraveActivity; diff --git a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAds.java b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAds.java index feb63021820..3977b022b25 100644 --- a/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAds.java +++ b/browser/brave_ads/android/java/org/chromium/chrome/browser/notifications/BraveAds.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.notifications; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; import org.chromium.chrome.browser.notifications.channels.BraveChannelDefinitions; /** diff --git a/browser/download/android/java/src/org/chromium/chrome/browser/download/BraveMimeUtils.java b/browser/download/android/java/src/org/chromium/chrome/browser/download/BraveMimeUtils.java index 41821ad98d4..533b918739b 100644 --- a/browser/download/android/java/src/org/chromium/chrome/browser/download/BraveMimeUtils.java +++ b/browser/download/android/java/src/org/chromium/chrome/browser/download/BraveMimeUtils.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.download; import org.chromium.base.BravePreferenceKeys; import org.chromium.base.ContextUtils; -import org.chromium.base.annotations.CalledByNative; +import org.jni_zero.CalledByNative; public class BraveMimeUtils { @CalledByNative diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 827fd999609..a0bbf17d5f6 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -16,7 +16,6 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAutocompleteCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAutocompleteMediatorBaseClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAutocompleteMediatorClassAdapter.java", - "//brave/build/android/bytecode/java/org/brave/bytecode/BraveAutofillPopupBridgeClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkActivityClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkBridgeClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkDelegateClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 8a8fab09118..5ee7c247ef0 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -19,7 +19,6 @@ public class BraveClassAdapter { chain = new BraveAutocompleteCoordinatorClassAdapter(chain); chain = new BraveAutocompleteMediatorBaseClassAdapter(chain); chain = new BraveAutocompleteMediatorClassAdapter(chain); - chain = new BraveAutofillPopupBridgeClassAdapter(chain); chain = new BraveBookmarkActivityClassAdapter(chain); chain = new BraveBookmarkBridgeClassAdapter(chain); chain = new BraveBookmarkDelegateClassAdapter(chain); diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java index 0fdc962845f..72b07fd09a5 100644 --- a/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java +++ b/components/permissions/android/java/src/org/chromium/components/permissions/BravePermissionDialogDelegate.java @@ -5,8 +5,8 @@ package org.chromium.components.permissions; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; /* PermissionDialogDelegate override */ @JNINamespace("permissions") diff --git a/components/safetynet/java/org/chromium/chrome/browser/util/SafetyNetCheck.java b/components/safetynet/java/org/chromium/chrome/browser/util/SafetyNetCheck.java index 384e5ba77b6..8c8f41bcaae 100644 --- a/components/safetynet/java/org/chromium/chrome/browser/util/SafetyNetCheck.java +++ b/components/safetynet/java/org/chromium/chrome/browser/util/SafetyNetCheck.java @@ -26,9 +26,9 @@ import org.json.JSONObject; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.base.annotations.CalledByNative; -import org.chromium.base.annotations.JNINamespace; -import org.chromium.base.annotations.NativeMethods; +import org.jni_zero.CalledByNative; +import org.jni_zero.JNINamespace; +import org.jni_zero.NativeMethods; import org.chromium.chrome.browser.BraveLocalState; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.preferences.BravePref;