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
Change-Id: Ib6cb82809fd480bce81e8e0808501faf837fa9cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4935910
Auto-Submit: Sam Maier <[email protected]>
Commit-Queue: Sam Maier <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Commit-Queue: Andrew Grieve <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1208878}


CrOS-Libchrome-Original-Commit: c45bc648b3616610b5c2a19ea5060492dc1cb24b

Author: Sam Maier

base/android/java/src/org/chromium/base/ApkAssets.java

@@ -9,8 +9,8 @@
 import android.content.res.AssetManager;
 import android.text.TextUtils;
 
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
 
 import java.io.IOException;
 

base/android/java/src/org/chromium/base/ApplicationStatus.java

@@ -17,9 +17,10 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-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.build.BuildConfig;
 
 import java.lang.reflect.Field;

base/android/java/src/org/chromium/base/BaseFeatureMap.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 /**
  * Java accessor for base::Features listed in {@link BaseFeatures}

base/android/java/src/org/chromium/base/BuildInfo.java

@@ -21,7 +21,8 @@
 import androidx.annotation.OptIn;
 import androidx.core.os.BuildCompat;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
+
 import org.chromium.base.compat.ApiHelperForP;
 import org.chromium.build.BuildConfig;
 

base/android/java/src/org/chromium/base/BundleUtils.java

@@ -22,7 +22,8 @@
 import dalvik.system.BaseDexClassLoader;
 import dalvik.system.PathClassLoader;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
+
 import org.chromium.base.compat.ApiHelperForO;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.build.BuildConfig;

base/android/java/src/org/chromium/base/Callback.java

@@ -4,7 +4,7 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 /**
  * A simple single-argument callback to handle the result of a computation.

base/android/java/src/org/chromium/base/CommandLine.java

@@ -9,7 +9,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.NativeMethods;
 
 import java.io.File;
 import java.io.FileReader;

base/android/java/src/org/chromium/base/ContentUriUtils.java

@@ -18,7 +18,7 @@
 
 import androidx.annotation.Nullable;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 import java.io.File;
 import java.io.IOException;

base/android/java/src/org/chromium/base/ContextUtils.java

@@ -20,7 +20,8 @@
 
 import androidx.annotation.Nullable;
 
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.JNINamespace;
+
 import org.chromium.base.compat.ApiHelperForM;
 import org.chromium.base.compat.ApiHelperForO;
 import org.chromium.build.BuildConfig;

base/android/java/src/org/chromium/base/CpuFeatures.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 // The only purpose of this class is to allow sending CPU properties
 // from the browser process to sandboxed renderer processes. This is

base/android/java/src/org/chromium/base/EarlyTraceEvent.java

@@ -10,9 +10,9 @@
 
 import androidx.annotation.VisibleForTesting;
 
-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.io.File;
 import java.util.ArrayList;

base/android/java/src/org/chromium/base/EventLog.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
 
 /**
  * A simple interface to Android's EventLog to be used by native code.

base/android/java/src/org/chromium/base/FeatureList.java

@@ -10,8 +10,9 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-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.library_loader.LibraryLoader;
 
 import java.util.HashMap;

base/android/java/src/org/chromium/base/FeatureMap.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 import java.util.Collections;
 import java.util.HashMap;

base/android/java/src/org/chromium/base/Features.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 /**
  * A class that serves as a bridge to native code to check the status of feature switches.

base/android/java/src/org/chromium/base/FieldTrialList.java

@@ -4,7 +4,7 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.NativeMethods;
 
 /**
  * Helper to get field trial information.

base/android/java/src/org/chromium/base/FileUtils.java

@@ -13,8 +13,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 /**
  * This class provides an interface to the native class for writing

base/android/java/src/org/chromium/base/IntStringCallback.java

@@ -4,7 +4,7 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 /**
  * A simple 2-argument callback with an int and a String as arguments.

base/android/java/src/org/chromium/base/JNIUtils.java

@@ -4,7 +4,7 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 import java.util.Map;
 

base/android/java/src/org/chromium/base/JavaExceptionReporter.java

@@ -6,9 +6,9 @@
 
 import androidx.annotation.UiThread;
 
-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;
 
 /**
  * This UncaughtExceptionHandler will create a breakpad minidump when there is an uncaught

base/android/java/src/org/chromium/base/JavaHandlerThread.java

@@ -8,9 +8,9 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 
-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.lang.Thread.UncaughtExceptionHandler;
 

base/android/java/src/org/chromium/base/LocaleUtils.java

@@ -13,7 +13,7 @@
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 import java.util.ArrayList;
 import java.util.Locale;

base/android/java/src/org/chromium/base/MemoryPressureListener.java

@@ -7,8 +7,9 @@
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
 
-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.base.memory.MemoryPressureCallback;
 
 /**

base/android/java/src/org/chromium/base/PathService.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 /**
  * This class provides java side access to the native PathService.

base/android/java/src/org/chromium/base/PathUtils.java

@@ -16,7 +16,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
+
 import org.chromium.base.compat.ApiHelperForM;
 import org.chromium.base.compat.ApiHelperForQ;
 import org.chromium.base.compat.ApiHelperForR;

base/android/java/src/org/chromium/base/PiiElider.java

@@ -7,7 +7,7 @@
 import android.text.TextUtils;
 import android.util.Patterns;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

base/android/java/src/org/chromium/base/PowerMonitor.java

@@ -12,9 +12,10 @@
 import android.os.Build;
 import android.os.PowerManager;
 
-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.compat.ApiHelperForQ;
 
 /**

base/android/java/src/org/chromium/base/RadioUtils.java

@@ -17,8 +17,9 @@
 
 import androidx.annotation.RequiresApi;
 
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+
 import org.chromium.base.compat.ApiHelperForM;
 import org.chromium.base.compat.ApiHelperForP;
 

base/android/java/src/org/chromium/base/SysUtils.java

@@ -13,9 +13,10 @@
 import android.os.StrictMode;
 import android.util.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.build.BuildConfig;
 
 import java.io.BufferedReader;

base/android/java/src/org/chromium/base/ThreadUtils.java

@@ -8,7 +8,8 @@
 import android.os.Looper;
 import android.os.Process;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
+
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 

base/android/java/src/org/chromium/base/TimezoneUtils.java

@@ -6,8 +6,8 @@
 
 import android.os.StrictMode;
 
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
 
 import java.util.TimeZone;
 

base/android/java/src/org/chromium/base/TraceEvent.java

@@ -15,9 +15,10 @@
 
 import androidx.annotation.VisibleForTesting;
 
-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;
 

base/android/java/src/org/chromium/base/UnguessableToken.java

@@ -9,7 +9,7 @@
 
 import androidx.annotation.Nullable;
 
-import org.chromium.base.annotations.CalledByNative;
+import org.jni_zero.CalledByNative;
 
 /**
  * This class mirrors unguessable_token.h .  Since tokens are passed by value,

base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java

@@ -4,8 +4,8 @@
 
 package org.chromium.base.jank_tracker;
 
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
 
 /**
  * Sends Android jank metrics to native to be recorded using UMA.