Android JNI generation: Set JNI namespace in build files

This CL removes the use of the @JNINamespace annotation and instead sets the correct JNI namespace in the build file. Bug: webrtc:8278 Change-Id: Ia4490399e45a97d56b02c260fd80df4edfa092bf Reviewed-on: https://webrtc-review.googlesource.com/76440 Commit-Queue: Magnus Jedvert <[email protected]> Reviewed-by: Sami Kalliomäki <[email protected]> Cr-Commit-Position: refs/heads/master@{#23299}
czs100 · May 18, 2018 · c7da266 · c7da266
1 parent 7e6fcea
commit c7da266
Show file tree

Hide file tree

Showing 72 changed files with 131 additions and 240 deletions.
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
@@ -28,6 +28,7 @@ generate_jni("generated_jni") {
     "java/org/webrtc/examples/androidnativeapi/CallClient.java",
   ]
   jni_package = ""
+  namespace = "webrtc_examples"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 

diff --git a/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/CallClient.java b/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/CallClient.java
@@ -13,13 +13,10 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.HandlerThread;
-import org.webrtc.JNINamespace;
-import org.webrtc.NativeClassQualifiedName;
 import org.webrtc.SurfaceTextureHelper;
 import org.webrtc.VideoCapturer;
 import org.webrtc.VideoSink;
 
-@JNINamespace("webrtc_examples")
 public class CallClient {
   private static final String TAG = "CallClient";
   private static final int CAPTURE_WIDTH = 640;
@@ -65,13 +62,10 @@ public void close() {
   }
 
   private static native long nativeCreateClient();
-  @NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
-  private static native void nativeCall(long nativePtr, VideoSink localSink, VideoSink remoteSink);
-  @NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
-  private static native void nativeHangup(long nativePtr);
-  @NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
-  private static native void nativeDelete(long nativePtr);
-  @NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
+  private static native void nativeCall(
+      long nativeAndroidCallClient, VideoSink localSink, VideoSink remoteSink);
+  private static native void nativeHangup(long nativeAndroidCallClient);
+  private static native void nativeDelete(long nativeAndroidCallClient);
   private static native VideoCapturer.CapturerObserver nativeGetJavaVideoCapturerObserver(
-      long nativePtr);
+      long nativeAndroidCallClient);
 }
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
@@ -42,6 +42,7 @@ generate_jni("generated_base_jni") {
     "src/java/org/webrtc/JniCommon.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -252,6 +253,7 @@ generate_jni("generated_audio_device_module_base_jni") {
     "src/java/org/webrtc/audio/WebRtcAudioManager.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -261,6 +263,7 @@ generate_jni("generated_java_audio_device_module_native_jni") {
     "src/java/org/webrtc/audio/WebRtcAudioTrack.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -297,6 +300,7 @@ generate_jni("generated_video_jni") {
     sources += [ "api/org/webrtc/HardwareVideoEncoderFactory.java" ]  # TODO(andersc): This currently depends on SoftwareVideoEncoderFactory
   }
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -418,6 +422,7 @@ generate_jni("generated_vp8_jni") {
   ]
 
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -440,6 +445,7 @@ generate_jni("generated_vp9_jni") {
   ]
 
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -509,6 +515,7 @@ generate_jni("generated_peerconnection_jni") {
     "api/org/webrtc/TurnCustomizer.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -628,6 +635,7 @@ generate_jni("generated_metrics_jni") {
     "api/org/webrtc/Metrics.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -734,8 +742,6 @@ rtc_android_library("base_java") {
     "src/java/org/webrtc/Histogram.java",
     "src/java/org/webrtc/JniCommon.java",
     "src/java/org/webrtc/JniHelper.java",
-    "src/java/org/webrtc/JNINamespace.java",
-    "src/java/org/webrtc/NativeClassQualifiedName.java",
     "src/java/org/webrtc/RefCountDelegate.java",
     "src/java/org/webrtc/WebRtcClassLoader.java",
   ]
@@ -827,6 +833,7 @@ generate_jni("generated_java_audio_jni") {
     "api/org/webrtc/audio/JavaAudioDeviceModule.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -1138,6 +1145,7 @@ generate_jni("generated_native_api_jni") {
     "src/java/org/webrtc/WebRtcClassLoader.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 
@@ -1252,6 +1260,7 @@ generate_jni("generated_native_unittests_jni") {
     "native_unittests/org/webrtc/PeerConnectionFactoryInitializationHelper.java",
   ]
   jni_package = ""
+  namespace = "webrtc::jni"
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
 }
 

diff --git a/sdk/android/api/org/webrtc/AudioTrack.java b/sdk/android/api/org/webrtc/AudioTrack.java
@@ -11,7 +11,6 @@
 package org.webrtc;
 
 /** Java wrapper for a C++ AudioTrackInterface */
-@JNINamespace("webrtc::jni")
 public class AudioTrack extends MediaStreamTrack {
   public AudioTrack(long nativeTrack) {
     super(nativeTrack);

diff --git a/sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java b/sdk/android/api/org/webrtc/CallSessionFileRotatingLogSink.java
@@ -10,7 +10,6 @@
 
 package org.webrtc;
 
-@JNINamespace("webrtc::jni")
 public class CallSessionFileRotatingLogSink {
   private long nativeSink;
 

diff --git a/sdk/android/api/org/webrtc/DataChannel.java b/sdk/android/api/org/webrtc/DataChannel.java
@@ -13,7 +13,6 @@
 import java.nio.ByteBuffer;
 
 /** Java wrapper for a C++ DataChannelInterface. */
-@JNINamespace("webrtc::jni")
 public class DataChannel {
   /** Java wrapper for WebIDL RTCDataChannel. */
   public static class Init {

diff --git a/sdk/android/api/org/webrtc/DtmfSender.java b/sdk/android/api/org/webrtc/DtmfSender.java
@@ -11,7 +11,6 @@
 package org.webrtc;
 
 /** Java wrapper for a C++ DtmfSenderInterface. */
-@JNINamespace("webrtc::jni")
 public class DtmfSender {
   final long nativeDtmfSender;
 

diff --git a/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
@@ -26,7 +26,6 @@
 
 /** Factory for android hardware video encoders. */
 @SuppressWarnings("deprecation") // API 16 requires the use of deprecated methods.
-@JNINamespace("webrtc::jni")
 public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
   private static final String TAG = "HardwareVideoEncoderFactory";
 

diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
@@ -37,7 +37,6 @@
 // This class is an implementation detail of the Java PeerConnection API.
 @TargetApi(19)
 @SuppressWarnings("deprecation")
-@JNINamespace("webrtc::jni")
 public class MediaCodecVideoEncoder {
   // This class is constructed, operated, and destroyed by its C++ incarnation,
   // so the class and its methods have non-public visibility.  The API this

diff --git a/sdk/android/api/org/webrtc/MediaSource.java b/sdk/android/api/org/webrtc/MediaSource.java
@@ -11,7 +11,6 @@
 package org.webrtc;
 
 /** Java wrapper for a C++ MediaSourceInterface. */
-@JNINamespace("webrtc::jni")
 public class MediaSource {
   /** Tracks MediaSourceInterface.SourceState */
   public enum State {

diff --git a/sdk/android/api/org/webrtc/MediaStream.java b/sdk/android/api/org/webrtc/MediaStream.java
@@ -15,7 +15,6 @@
 import java.util.Iterator;
 
 /** Java wrapper for a C++ MediaStreamInterface. */
-@JNINamespace("webrtc::jni")
 public class MediaStream {
   private static final String TAG = "MediaStream";
 

diff --git a/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java
@@ -13,7 +13,6 @@
 import javax.annotation.Nullable;
 
 /** Java wrapper for a C++ MediaStreamTrackInterface. */
-@JNINamespace("webrtc::jni")
 public class MediaStreamTrack {
   public static final String AUDIO_TRACK_KIND = "audio";
   public static final String VIDEO_TRACK_KIND = "video";

diff --git a/sdk/android/api/org/webrtc/Metrics.java b/sdk/android/api/org/webrtc/Metrics.java
@@ -28,7 +28,6 @@
 // Most histograms are not updated frequently (e.g. most video metrics are an
 // average over the call and recorded when a stream is removed).
 // The metrics can for example be retrieved when a peer connection is closed.
-@JNINamespace("webrtc::jni")
 public class Metrics {
   private static final String TAG = "Metrics";
 

diff --git a/sdk/android/api/org/webrtc/NetworkMonitor.java b/sdk/android/api/org/webrtc/NetworkMonitor.java
@@ -278,18 +278,13 @@ public static boolean isOnline() {
     return connectionType != ConnectionType.CONNECTION_NONE;
   }
 
-  @NativeClassQualifiedName("webrtc::jni::AndroidNetworkMonitor")
-  private native void nativeNotifyConnectionTypeChanged(long nativePtr);
-
-  @NativeClassQualifiedName("webrtc::jni::AndroidNetworkMonitor")
-  private native void nativeNotifyOfNetworkConnect(long nativePtr, NetworkInformation networkInfo);
-
-  @NativeClassQualifiedName("webrtc::jni::AndroidNetworkMonitor")
-  private native void nativeNotifyOfNetworkDisconnect(long nativePtr, long networkHandle);
-
-  @NativeClassQualifiedName("webrtc::jni::AndroidNetworkMonitor")
+  private native void nativeNotifyConnectionTypeChanged(long nativeAndroidNetworkMonitor);
+  private native void nativeNotifyOfNetworkConnect(
+      long nativeAndroidNetworkMonitor, NetworkInformation networkInfo);
+  private native void nativeNotifyOfNetworkDisconnect(
+      long nativeAndroidNetworkMonitor, long networkHandle);
   private native void nativeNotifyOfActiveNetworkList(
-      long nativePtr, NetworkInformation[] networkInfos);
+      long nativeAndroidNetworkMonitor, NetworkInformation[] networkInfos);
 
   // For testing only.
   @Nullable

diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -21,7 +21,6 @@
  * JS APIs: http://dev.w3.org/2011/webrtc/editor/webrtc.html and
  * http://www.w3.org/TR/mediacapture-streams/
  */
-@JNINamespace("webrtc::jni")
 public class PeerConnection {
   /** Tracks PeerConnectionInterface::IceGatheringState */
   public enum IceGatheringState {

diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -20,7 +20,6 @@
  * Java wrapper for a C++ PeerConnectionFactoryInterface.  Main entry point to
  * the PeerConnection API for clients.
  */
-@JNINamespace("webrtc::jni")
 public class PeerConnectionFactory {
   public static final String TRIAL_ENABLED = "Enabled";
   @Deprecated public static final String VIDEO_FRAME_EMIT_TRIAL = "VideoFrameEmit";

diff --git a/sdk/android/api/org/webrtc/RtpReceiver.java b/sdk/android/api/org/webrtc/RtpReceiver.java
@@ -14,7 +14,6 @@
 import org.webrtc.MediaStreamTrack;
 
 /** Java wrapper for a C++ RtpReceiverInterface. */
-@JNINamespace("webrtc::jni")
 public class RtpReceiver {
   /** Java wrapper for a C++ RtpReceiverObserverInterface*/
   public static interface Observer {

diff --git a/sdk/android/api/org/webrtc/RtpSender.java b/sdk/android/api/org/webrtc/RtpSender.java
@@ -13,7 +13,6 @@
 import javax.annotation.Nullable;
 
 /** Java wrapper for a C++ RtpSenderInterface. */
-@JNINamespace("webrtc::jni")
 public class RtpSender {
   final long nativeRtpSender;
 

diff --git a/sdk/android/api/org/webrtc/RtpTransceiver.java b/sdk/android/api/org/webrtc/RtpTransceiver.java
@@ -31,7 +31,6 @@
  * <p>WebRTC specification for RTCRtpTransceiver, the JavaScript analog:
  * https://w3c.github.io/webrtc-pc/#dom-rtcrtptransceiver
  */
-@JNINamespace("webrtc::jni")
 public class RtpTransceiver {
   /** Java version of webrtc::RtpTransceiverDirection - the ordering must be kept in sync. */
   public enum RtpTransceiverDirection {

diff --git a/sdk/android/api/org/webrtc/TurnCustomizer.java b/sdk/android/api/org/webrtc/TurnCustomizer.java
@@ -11,7 +11,6 @@
 package org.webrtc;
 
 /** Java wrapper for a C++ TurnCustomizer. */
-@JNINamespace("webrtc::jni")
 public class TurnCustomizer {
   final long nativeTurnCustomizer;
 

diff --git a/sdk/android/api/org/webrtc/VideoDecoderFallback.java b/sdk/android/api/org/webrtc/VideoDecoderFallback.java
@@ -13,7 +13,6 @@
 /**
  * A combined video decoder that falls back on a secondary decoder if the primary decoder fails.
  */
-@JNINamespace("webrtc::jni")
 public class VideoDecoderFallback extends WrappedNativeVideoDecoder {
   private final VideoDecoder fallback;
   private final VideoDecoder primary;

diff --git a/sdk/android/api/org/webrtc/VideoEncoderFallback.java b/sdk/android/api/org/webrtc/VideoEncoderFallback.java
@@ -13,7 +13,6 @@
 /**
  * A combined video encoder that falls back on a secondary encoder if the primary encoder fails.
  */
-@JNINamespace("webrtc::jni")
 public class VideoEncoderFallback extends WrappedNativeVideoEncoder {
   private final VideoEncoder fallback;
   private final VideoEncoder primary;

diff --git a/sdk/android/api/org/webrtc/VideoFileRenderer.java b/sdk/android/api/org/webrtc/VideoFileRenderer.java
@@ -24,7 +24,6 @@
 /**
  * Can be used to save the video frames to file.
  */
-@JNINamespace("webrtc::jni")
 public class VideoFileRenderer implements VideoSink {
   private static final String TAG = "VideoFileRenderer";
 

diff --git a/sdk/android/api/org/webrtc/VideoFrame.java b/sdk/android/api/org/webrtc/VideoFrame.java
@@ -26,7 +26,6 @@
  * format and serves as a fallback for video sinks that can only handle I420, e.g. the internal
  * WebRTC software encoders.
  */
-@JNINamespace("webrtc::jni")
 public class VideoFrame implements RefCounted {
   /**
    * Implements image storage medium. Might be for example an OpenGL texture or a memory region

diff --git a/sdk/android/api/org/webrtc/VideoFrameDrawer.java b/sdk/android/api/org/webrtc/VideoFrameDrawer.java
@@ -21,7 +21,6 @@
  * drawer.drawYuv depending on the type of the buffer. The frame will be rendered with rotation
  * taken into account. You can supply an additional render matrix for custom transformations.
  */
-@JNINamespace("webrtc::jni")
 public class VideoFrameDrawer {
   /**
    * Draws a VideoFrame.TextureBuffer. Calls either drawer.drawOes or drawer.drawRgb

diff --git a/sdk/android/api/org/webrtc/VideoRenderer.java b/sdk/android/api/org/webrtc/VideoRenderer.java
@@ -20,7 +20,6 @@
  * class also provides a createGui() method for creating a GUI-rendering window
  * on various platforms.
  */
-@JNINamespace("webrtc::jni")
 public class VideoRenderer {
   /**
    * Java version of webrtc::VideoFrame. Frames are only constructed from native code and test

diff --git a/sdk/android/api/org/webrtc/VideoSource.java b/sdk/android/api/org/webrtc/VideoSource.java
@@ -15,7 +15,6 @@
 /**
  * Java wrapper of native AndroidVideoTrackSource.
  */
-@JNINamespace("webrtc::jni")
 public class VideoSource extends MediaSource {
   private final NativeCapturerObserver capturerObserver;
 

diff --git a/sdk/android/api/org/webrtc/VideoTrack.java b/sdk/android/api/org/webrtc/VideoTrack.java
@@ -15,7 +15,6 @@
 import java.util.List;
 
 /** Java version of VideoTrackInterface. */
-@JNINamespace("webrtc::jni")
 public class VideoTrack extends MediaStreamTrack {
   private final List<VideoRenderer> renderers = new ArrayList<>();
   private final IdentityHashMap<VideoSink, Long> sinks = new IdentityHashMap<VideoSink, Long>();

diff --git a/sdk/android/api/org/webrtc/YuvHelper.java b/sdk/android/api/org/webrtc/YuvHelper.java
@@ -13,7 +13,6 @@
 import java.nio.ByteBuffer;
 
 /** Wraps libyuv methods to Java. All passed byte buffers must be direct byte buffers. */
-@JNINamespace("webrtc::jni")
 public class YuvHelper {
   /** Helper method for copying I420 to tightly packed destination buffer. */
   public static void I420Copy(ByteBuffer srcY, int srcStrideY, ByteBuffer srcU, int srcStrideU,

diff --git a/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java b/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java
@@ -12,15 +12,13 @@
 
 import android.media.AudioManager;
 import android.content.Context;
-import org.webrtc.JNINamespace;
 import org.webrtc.JniCommon;
 import org.webrtc.Logging;
 
 /**
  * AudioDeviceModule implemented using android.media.AudioRecord as input and
  * android.media.AudioTrack as output.
  */
-@JNINamespace("webrtc::jni")
 public class JavaAudioDeviceModule implements AudioDeviceModule {
   private static final String TAG = "JavaAudioDeviceModule";