jni_zero: Migrating all JNI annotations in /device 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.
R=chengweih@chromium.org
Bug: 1456762
Change-Id: I6eb74ba61d45eed5341f7ce3671b5873d4e54e9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4936991
Auto-Submit: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1210987}
diff --git a/device/BUILD.gn b/device/BUILD.gn
index 93f0b1b3..ca55954 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -489,11 +489,11 @@
sources = bluetooth_java_sources_needing_jni
deps = [
"//base:base_java",
- "//base:jni_java",
"//components/location/android:location_java",
"//device/bluetooth:java",
"//third_party/android_sdk:android_test_mock_java",
"//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/jni_zero:jni_zero_java",
]
srcjar_deps = [
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index f970141..6a66287 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -693,10 +693,10 @@
sources = java_sources_needing_jni
deps = [
"//base:base_java",
- "//base:jni_java",
"//build/android:build_java",
"//components/location/android:location_java",
"//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/jni_zero:jni_zero_java",
]
}
}
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
index 08aaf658..016147f9 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
@@ -17,11 +17,12 @@
import android.os.ParcelUuid;
import android.util.SparseArray;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
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.chromium.components.location.LocationUtils;
import java.util.List;
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
index bbaf053..696e491 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
@@ -6,11 +6,12 @@
import android.bluetooth.BluetoothDevice;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
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 java.util.HashMap;
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
index c6e1ab4..3136abc 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java
@@ -4,10 +4,11 @@
package org.chromium.device.bluetooth;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
import org.chromium.base.Log;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
import java.util.List;
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattDescriptor.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattDescriptor.java
index c53663d5..61f3be8 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattDescriptor.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattDescriptor.java
@@ -4,10 +4,11 @@
package org.chromium.device.bluetooth;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
import org.chromium.base.Log;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
/**
* Exposes android.bluetooth.BluetoothGattDescriptor as necessary
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattService.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattService.java
index 39ec834..3821250e 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattService.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattService.java
@@ -4,10 +4,11 @@
package org.chromium.device.bluetooth;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
import org.chromium.base.Log;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
import java.util.List;
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterBuilder.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterBuilder.java
index f60383ae..c7f3c945 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterBuilder.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterBuilder.java
@@ -7,8 +7,8 @@
import android.bluetooth.le.ScanFilter;
import android.os.ParcelUuid;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
/**
* Exposes android.bluetooth.le.ScanFilter.Builder as necessary for C++.
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterList.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterList.java
index cf60f3c..c6150246 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterList.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterList.java
@@ -6,8 +6,8 @@
import android.bluetooth.le.ScanFilter;
-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.ArrayList;
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
index 56d514c..84bb156 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
@@ -24,11 +24,12 @@
import android.os.ParcelUuid;
import android.util.SparseArray;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
import java.util.ArrayList;
import java.util.HashMap;
@@ -126,8 +127,10 @@
== PackageManager.PERMISSION_GRANTED;
if (!hasPermission) {
- Log.w(TAG,
- "BluetoothAdapterWrapper.create failed: Lacking Bluetooth permissions.");
+ Log.w(
+ TAG,
+ "BluetoothAdapterWrapper.create failed: Lacking Bluetooth"
+ + " permissions.");
return null;
}
}
diff --git a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilter.java b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilter.java
index 901ecb7..09ac13568 100644
--- a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilter.java
+++ b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilter.java
@@ -6,8 +6,8 @@
import android.bluetooth.le.ScanFilter;
-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.List;
diff --git a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
index 6b8708f..8a06436 100644
--- a/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
+++ b/device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java
@@ -18,10 +18,11 @@
import android.test.mock.MockContext;
import android.util.SparseArray;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
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.chromium.components.location.LocationUtils;
import org.chromium.device.bluetooth.test.TestRSSI;
import org.chromium.device.bluetooth.test.TestTxPower;
diff --git a/device/gamepad/BUILD.gn b/device/gamepad/BUILD.gn
index b26349d9..93b5bf7 100644
--- a/device/gamepad/BUILD.gn
+++ b/device/gamepad/BUILD.gn
@@ -214,9 +214,9 @@
]
deps = [
"//base:base_java",
- "//base:jni_java",
"//build/android:build_java",
"//third_party/androidx:androidx_annotation_annotation_java",
+ "//third_party/jni_zero:jni_zero_java",
]
srcjar_deps = [
diff --git a/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadList.java b/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadList.java
index 1fa13a3..c20f6d3c 100644
--- a/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadList.java
+++ b/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadList.java
@@ -13,10 +13,11 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+import org.jni_zero.NativeMethods;
+
import org.chromium.base.ThreadUtils;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
import java.util.Objects;
diff --git a/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadMappings.java b/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadMappings.java
index 64f9fb60..53e63def 100644
--- a/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadMappings.java
+++ b/device/gamepad/android/java/src/org/chromium/device/gamepad/GamepadMappings.java
@@ -11,7 +11,7 @@
import androidx.annotation.VisibleForTesting;
-import org.chromium.base.annotations.JNINamespace;
+import org.jni_zero.JNINamespace;
import java.util.BitSet;
diff --git a/device/vr/BUILD.gn b/device/vr/BUILD.gn
index c59a331..d553035 100644
--- a/device/vr/BUILD.gn
+++ b/device/vr/BUILD.gn
@@ -398,9 +398,9 @@
sources = java_sources_needing_jni
deps = [
"//base:base_java",
- "//base:jni_java",
"//build/android:build_java",
"//third_party/gvr-android-sdk:gvr_common_java",
+ "//third_party/jni_zero:jni_zero_java",
"//ui/android:ui_java",
]
}
diff --git a/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java b/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java
index 306ba33a..327978d 100644
--- a/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java
+++ b/device/vr/android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java
@@ -10,10 +10,11 @@
import com.google.vr.cardboard.DisplaySynchronizer;
import com.google.vr.ndk.base.GvrApi;
+import org.jni_zero.CalledByNative;
+import org.jni_zero.JNINamespace;
+
import org.chromium.base.ContextUtils;
import org.chromium.base.StrictModeContext;
-import org.chromium.base.annotations.CalledByNative;
-import org.chromium.base.annotations.JNINamespace;
import org.chromium.ui.display.DisplayAndroidManager;
/**