Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] Migrating all JNI annotations in /base to jni_zero copies

Browse Source 
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
This commit is contained in:
Artem Samoilenko
2023-11-27 11:27:30 -05:00
committed by mkarolin
parent 95cd027c3c
commit 0c849a22b2
49 changed files with 89 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveFeatureUtil.java
+2 -2
View File
@@ -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 {
android/java/org/chromium/chrome/browser/BraveLocalState.java
+2 -2
View File
@@ -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;
/**
android/java/org/chromium/chrome/browser/BraveRelaunchUtils.java
+2 -2
View File
@@ -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")
android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
+3 -3
View File
@@ -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;
android/java/org/chromium/chrome/browser/BraveSyncWorker.java
+3 -3
View File
@@ -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 {
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkBridge.java
+2 -2
View File
@@ -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 {
android/java/org/chromium/chrome/browser/brave_leo/BraveLeoSettingsLauncherHelper.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/brave_news/BraveNewsControllerFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/AssetRatioServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/BlockchainRegistryFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletProviderDelegateImplHelper.java
+3 -3
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/JsonRpcServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/KeyringServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/SwapServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/TxServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/permission/BraveDappPermissionPromptDialog.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletDataFilesInstallerUtil.java
+1 -1
View File
@@ -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
android/java/org/chromium/chrome/browser/crypto_wallet/util/WalletNativeUtils.java
+2 -2
View File
@@ -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")
android/java/org/chromium/chrome/browser/informers/BraveSyncAccountDeletedInformer.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/misc_metrics/MiscAndroidMetricsFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java
+1 -1
View File
@@ -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];
android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java
+1 -1
View File
@@ -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
android/java/org/chromium/chrome/browser/ntp_background_images/NTPBackgroundImagesBridge.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/playlist/PlaylistServiceFactoryAndroid.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
+2 -2
View File
@@ -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;
/**
android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java
+3 -3
View File
@@ -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;
android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEnginePrefHelper.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
+1 -1
View File
@@ -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;
android/java/org/chromium/chrome/browser/speedreader/BraveSpeedReaderUtils.java
+2 -2
View File
@@ -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;
android/java/org/chromium/chrome/browser/sync/BraveSyncDevices.java
+3 -3
View File
@@ -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;
android/java/org/chromium/chrome/browser/util/BraveReferrer.java
+3 -3
View File
@@ -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;
android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java
+3 -3
View File
@@ -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;