Reland of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2106333005/ )
Reason for revert:
Issues fixed
Original issue's description:
> Revert of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2111823002/ )
>
> Reason for revert:
> Breaks downstream dependencies
>
> Original issue's description:
> > Combine webrtc/api/java/android and webrtc/api/java/src.
> >
> > It used to be that there was a Java api for devices not running Android
> > but that is no longer the case. I combined the directories and made
> > the folder structure chromium style.
> >
> > BUG=webrtc:6067
> > R=magjed@webrtc.org, tommi@webrtc.org
> >
> > Committed: https://chromium.googlesource.com/external/webrtc/+/ceefe20dd65387d83059d9fc1ce84842650ed5e2
>
> TBR=magjed@webrtc.org,tommi@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6067
>
> Committed: https://chromium.googlesource.com/external/webrtc/+/9b0dc622d46b6b09bb7ccaca6b2f68739c87ff8d
TBR=magjed@webrtc.org,tommi@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6067
Review-Url: https://codereview.webrtc.org/2111923003
Cr-Commit-Position: refs/heads/master@{#13363}
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index b0784ad..8f3327a 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -147,27 +147,27 @@
source_set("libjingle_peerconnection_jni") {
sources = [
+ "android/jni/androidmediacodeccommon.h",
+ "android/jni/androidmediadecoder_jni.cc",
+ "android/jni/androidmediadecoder_jni.h",
+ "android/jni/androidmediaencoder_jni.cc",
+ "android/jni/androidmediaencoder_jni.h",
+ "android/jni/androidmetrics_jni.cc",
+ "android/jni/androidnetworkmonitor_jni.cc",
+ "android/jni/androidnetworkmonitor_jni.h",
+ "android/jni/androidvideocapturer_jni.cc",
+ "android/jni/androidvideocapturer_jni.h",
+ "android/jni/classreferenceholder.cc",
+ "android/jni/classreferenceholder.h",
+ "android/jni/jni_helpers.cc",
+ "android/jni/jni_helpers.h",
+ "android/jni/native_handle_impl.cc",
+ "android/jni/native_handle_impl.h",
+ "android/jni/peerconnection_jni.cc",
+ "android/jni/surfacetexturehelper_jni.cc",
+ "android/jni/surfacetexturehelper_jni.h",
"androidvideocapturer.cc",
"androidvideocapturer.h",
- "java/jni/androidmediacodeccommon.h",
- "java/jni/androidmediadecoder_jni.cc",
- "java/jni/androidmediadecoder_jni.h",
- "java/jni/androidmediaencoder_jni.cc",
- "java/jni/androidmediaencoder_jni.h",
- "java/jni/androidmetrics_jni.cc",
- "java/jni/androidnetworkmonitor_jni.cc",
- "java/jni/androidnetworkmonitor_jni.h",
- "java/jni/androidvideocapturer_jni.cc",
- "java/jni/androidvideocapturer_jni.h",
- "java/jni/classreferenceholder.cc",
- "java/jni/classreferenceholder.h",
- "java/jni/jni_helpers.cc",
- "java/jni/jni_helpers.h",
- "java/jni/native_handle_impl.cc",
- "java/jni/native_handle_impl.h",
- "java/jni/peerconnection_jni.cc",
- "java/jni/surfacetexturehelper_jni.cc",
- "java/jni/surfacetexturehelper_jni.h",
]
configs += [
@@ -213,7 +213,7 @@
shared_library("libjingle_peerconnection_so") {
sources = [
- "java/jni/jni_onload.cc",
+ "android/jni/jni_onload.cc",
]
configs -= [ "//build/config/android:hide_native_jni_exports" ]
@@ -232,51 +232,51 @@
"../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java",
"../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java",
"../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java",
- "java/android/org/webrtc/Camera1Enumerator.java",
- "java/android/org/webrtc/Camera2Capturer.java",
- "java/android/org/webrtc/Camera2Enumerator.java",
- "java/android/org/webrtc/CameraEnumerationAndroid.java",
- "java/android/org/webrtc/CameraEnumerator.java",
- "java/android/org/webrtc/CameraVideoCapturer.java",
- "java/android/org/webrtc/EglBase.java",
- "java/android/org/webrtc/EglBase10.java",
- "java/android/org/webrtc/EglBase14.java",
- "java/android/org/webrtc/GlRectDrawer.java",
- "java/android/org/webrtc/GlShader.java",
- "java/android/org/webrtc/GlTextureFrameBuffer.java",
- "java/android/org/webrtc/GlUtil.java",
- "java/android/org/webrtc/NetworkMonitor.java",
- "java/android/org/webrtc/NetworkMonitorAutoDetect.java",
- "java/android/org/webrtc/RendererCommon.java",
- "java/android/org/webrtc/SurfaceTextureHelper.java",
- "java/android/org/webrtc/SurfaceViewRenderer.java",
- "java/android/org/webrtc/VideoCapturerAndroid.java",
- "java/android/org/webrtc/VideoRendererGui.java",
- "java/src/org/webrtc/AudioSource.java",
- "java/src/org/webrtc/AudioTrack.java",
- "java/src/org/webrtc/CallSessionFileRotatingLogSink.java",
- "java/src/org/webrtc/DataChannel.java",
- "java/src/org/webrtc/IceCandidate.java",
- "java/src/org/webrtc/MediaCodecVideoDecoder.java",
- "java/src/org/webrtc/MediaCodecVideoEncoder.java",
- "java/src/org/webrtc/MediaConstraints.java",
- "java/src/org/webrtc/MediaSource.java",
- "java/src/org/webrtc/MediaStream.java",
- "java/src/org/webrtc/MediaStreamTrack.java",
- "java/src/org/webrtc/Metrics.java",
- "java/src/org/webrtc/PeerConnection.java",
- "java/src/org/webrtc/PeerConnectionFactory.java",
- "java/src/org/webrtc/RtpParameters.java",
- "java/src/org/webrtc/RtpReceiver.java",
- "java/src/org/webrtc/RtpSender.java",
- "java/src/org/webrtc/SdpObserver.java",
- "java/src/org/webrtc/SessionDescription.java",
- "java/src/org/webrtc/StatsObserver.java",
- "java/src/org/webrtc/StatsReport.java",
- "java/src/org/webrtc/VideoCapturer.java",
- "java/src/org/webrtc/VideoRenderer.java",
- "java/src/org/webrtc/VideoSource.java",
- "java/src/org/webrtc/VideoTrack.java",
+ "android/java/src/org/webrtc/AudioSource.java",
+ "android/java/src/org/webrtc/AudioTrack.java",
+ "android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java",
+ "android/java/src/org/webrtc/Camera1Enumerator.java",
+ "android/java/src/org/webrtc/Camera2Capturer.java",
+ "android/java/src/org/webrtc/Camera2Enumerator.java",
+ "android/java/src/org/webrtc/CameraEnumerationAndroid.java",
+ "android/java/src/org/webrtc/CameraEnumerator.java",
+ "android/java/src/org/webrtc/CameraVideoCapturer.java",
+ "android/java/src/org/webrtc/DataChannel.java",
+ "android/java/src/org/webrtc/EglBase.java",
+ "android/java/src/org/webrtc/EglBase10.java",
+ "android/java/src/org/webrtc/EglBase14.java",
+ "android/java/src/org/webrtc/GlRectDrawer.java",
+ "android/java/src/org/webrtc/GlShader.java",
+ "android/java/src/org/webrtc/GlTextureFrameBuffer.java",
+ "android/java/src/org/webrtc/GlUtil.java",
+ "android/java/src/org/webrtc/IceCandidate.java",
+ "android/java/src/org/webrtc/MediaCodecVideoDecoder.java",
+ "android/java/src/org/webrtc/MediaCodecVideoEncoder.java",
+ "android/java/src/org/webrtc/MediaConstraints.java",
+ "android/java/src/org/webrtc/MediaSource.java",
+ "android/java/src/org/webrtc/MediaStream.java",
+ "android/java/src/org/webrtc/MediaStreamTrack.java",
+ "android/java/src/org/webrtc/Metrics.java",
+ "android/java/src/org/webrtc/NetworkMonitor.java",
+ "android/java/src/org/webrtc/NetworkMonitorAutoDetect.java",
+ "android/java/src/org/webrtc/PeerConnection.java",
+ "android/java/src/org/webrtc/PeerConnectionFactory.java",
+ "android/java/src/org/webrtc/RendererCommon.java",
+ "android/java/src/org/webrtc/RtpParameters.java",
+ "android/java/src/org/webrtc/RtpReceiver.java",
+ "android/java/src/org/webrtc/RtpSender.java",
+ "android/java/src/org/webrtc/SdpObserver.java",
+ "android/java/src/org/webrtc/SessionDescription.java",
+ "android/java/src/org/webrtc/StatsObserver.java",
+ "android/java/src/org/webrtc/StatsReport.java",
+ "android/java/src/org/webrtc/SurfaceTextureHelper.java",
+ "android/java/src/org/webrtc/SurfaceViewRenderer.java",
+ "android/java/src/org/webrtc/VideoCapturer.java",
+ "android/java/src/org/webrtc/VideoCapturerAndroid.java",
+ "android/java/src/org/webrtc/VideoRenderer.java",
+ "android/java/src/org/webrtc/VideoRendererGui.java",
+ "android/java/src/org/webrtc/VideoSource.java",
+ "android/java/src/org/webrtc/VideoTrack.java",
]
deps = [
diff --git a/webrtc/api/java/README b/webrtc/api/android/README
similarity index 100%
rename from webrtc/api/java/README
rename to webrtc/api/android/README
diff --git a/webrtc/api/java/src/org/webrtc/AudioSource.java b/webrtc/api/android/java/src/org/webrtc/AudioSource.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/AudioSource.java
rename to webrtc/api/android/java/src/org/webrtc/AudioSource.java
diff --git a/webrtc/api/java/src/org/webrtc/AudioTrack.java b/webrtc/api/android/java/src/org/webrtc/AudioTrack.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/AudioTrack.java
rename to webrtc/api/android/java/src/org/webrtc/AudioTrack.java
diff --git a/webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java b/webrtc/api/android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
rename to webrtc/api/android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
diff --git a/webrtc/api/java/android/org/webrtc/Camera1Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/Camera1Enumerator.java
rename to webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
diff --git a/webrtc/api/java/android/org/webrtc/Camera2Capturer.java b/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/Camera2Capturer.java
rename to webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java
diff --git a/webrtc/api/java/android/org/webrtc/Camera2Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/Camera2Enumerator.java
rename to webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java
diff --git a/webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java b/webrtc/api/android/java/src/org/webrtc/CameraEnumerationAndroid.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java
rename to webrtc/api/android/java/src/org/webrtc/CameraEnumerationAndroid.java
diff --git a/webrtc/api/java/android/org/webrtc/CameraEnumerator.java b/webrtc/api/android/java/src/org/webrtc/CameraEnumerator.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/CameraEnumerator.java
rename to webrtc/api/android/java/src/org/webrtc/CameraEnumerator.java
diff --git a/webrtc/api/java/android/org/webrtc/CameraVideoCapturer.java b/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/CameraVideoCapturer.java
rename to webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java
diff --git a/webrtc/api/java/src/org/webrtc/DataChannel.java b/webrtc/api/android/java/src/org/webrtc/DataChannel.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/DataChannel.java
rename to webrtc/api/android/java/src/org/webrtc/DataChannel.java
diff --git a/webrtc/api/java/android/org/webrtc/EglBase.java b/webrtc/api/android/java/src/org/webrtc/EglBase.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/EglBase.java
rename to webrtc/api/android/java/src/org/webrtc/EglBase.java
diff --git a/webrtc/api/java/android/org/webrtc/EglBase10.java b/webrtc/api/android/java/src/org/webrtc/EglBase10.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/EglBase10.java
rename to webrtc/api/android/java/src/org/webrtc/EglBase10.java
diff --git a/webrtc/api/java/android/org/webrtc/EglBase14.java b/webrtc/api/android/java/src/org/webrtc/EglBase14.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/EglBase14.java
rename to webrtc/api/android/java/src/org/webrtc/EglBase14.java
diff --git a/webrtc/api/java/android/org/webrtc/GlRectDrawer.java b/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/GlRectDrawer.java
rename to webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
diff --git a/webrtc/api/java/android/org/webrtc/GlShader.java b/webrtc/api/android/java/src/org/webrtc/GlShader.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/GlShader.java
rename to webrtc/api/android/java/src/org/webrtc/GlShader.java
diff --git a/webrtc/api/java/android/org/webrtc/GlTextureFrameBuffer.java b/webrtc/api/android/java/src/org/webrtc/GlTextureFrameBuffer.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/GlTextureFrameBuffer.java
rename to webrtc/api/android/java/src/org/webrtc/GlTextureFrameBuffer.java
diff --git a/webrtc/api/java/android/org/webrtc/GlUtil.java b/webrtc/api/android/java/src/org/webrtc/GlUtil.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/GlUtil.java
rename to webrtc/api/android/java/src/org/webrtc/GlUtil.java
diff --git a/webrtc/api/java/src/org/webrtc/IceCandidate.java b/webrtc/api/android/java/src/org/webrtc/IceCandidate.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/IceCandidate.java
rename to webrtc/api/android/java/src/org/webrtc/IceCandidate.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
rename to webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaCodecVideoEncoder.java b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaCodecVideoEncoder.java
rename to webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaConstraints.java b/webrtc/api/android/java/src/org/webrtc/MediaConstraints.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaConstraints.java
rename to webrtc/api/android/java/src/org/webrtc/MediaConstraints.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaSource.java b/webrtc/api/android/java/src/org/webrtc/MediaSource.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaSource.java
rename to webrtc/api/android/java/src/org/webrtc/MediaSource.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaStream.java b/webrtc/api/android/java/src/org/webrtc/MediaStream.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaStream.java
rename to webrtc/api/android/java/src/org/webrtc/MediaStream.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaStreamTrack.java b/webrtc/api/android/java/src/org/webrtc/MediaStreamTrack.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/MediaStreamTrack.java
rename to webrtc/api/android/java/src/org/webrtc/MediaStreamTrack.java
diff --git a/webrtc/api/java/src/org/webrtc/Metrics.java b/webrtc/api/android/java/src/org/webrtc/Metrics.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/Metrics.java
rename to webrtc/api/android/java/src/org/webrtc/Metrics.java
diff --git a/webrtc/api/java/android/org/webrtc/NetworkMonitor.java b/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/NetworkMonitor.java
rename to webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java
diff --git a/webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java b/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
rename to webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java
diff --git a/webrtc/api/java/android/org/webrtc/OWNERS b/webrtc/api/android/java/src/org/webrtc/OWNERS
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/OWNERS
rename to webrtc/api/android/java/src/org/webrtc/OWNERS
diff --git a/webrtc/api/java/src/org/webrtc/PeerConnection.java b/webrtc/api/android/java/src/org/webrtc/PeerConnection.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/PeerConnection.java
rename to webrtc/api/android/java/src/org/webrtc/PeerConnection.java
diff --git a/webrtc/api/java/src/org/webrtc/PeerConnectionFactory.java b/webrtc/api/android/java/src/org/webrtc/PeerConnectionFactory.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/PeerConnectionFactory.java
rename to webrtc/api/android/java/src/org/webrtc/PeerConnectionFactory.java
diff --git a/webrtc/api/java/android/org/webrtc/RendererCommon.java b/webrtc/api/android/java/src/org/webrtc/RendererCommon.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/RendererCommon.java
rename to webrtc/api/android/java/src/org/webrtc/RendererCommon.java
diff --git a/webrtc/api/java/src/org/webrtc/RtpParameters.java b/webrtc/api/android/java/src/org/webrtc/RtpParameters.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/RtpParameters.java
rename to webrtc/api/android/java/src/org/webrtc/RtpParameters.java
diff --git a/webrtc/api/java/src/org/webrtc/RtpReceiver.java b/webrtc/api/android/java/src/org/webrtc/RtpReceiver.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/RtpReceiver.java
rename to webrtc/api/android/java/src/org/webrtc/RtpReceiver.java
diff --git a/webrtc/api/java/src/org/webrtc/RtpSender.java b/webrtc/api/android/java/src/org/webrtc/RtpSender.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/RtpSender.java
rename to webrtc/api/android/java/src/org/webrtc/RtpSender.java
diff --git a/webrtc/api/java/src/org/webrtc/SdpObserver.java b/webrtc/api/android/java/src/org/webrtc/SdpObserver.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/SdpObserver.java
rename to webrtc/api/android/java/src/org/webrtc/SdpObserver.java
diff --git a/webrtc/api/java/src/org/webrtc/SessionDescription.java b/webrtc/api/android/java/src/org/webrtc/SessionDescription.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/SessionDescription.java
rename to webrtc/api/android/java/src/org/webrtc/SessionDescription.java
diff --git a/webrtc/api/java/src/org/webrtc/StatsObserver.java b/webrtc/api/android/java/src/org/webrtc/StatsObserver.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/StatsObserver.java
rename to webrtc/api/android/java/src/org/webrtc/StatsObserver.java
diff --git a/webrtc/api/java/src/org/webrtc/StatsReport.java b/webrtc/api/android/java/src/org/webrtc/StatsReport.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/StatsReport.java
rename to webrtc/api/android/java/src/org/webrtc/StatsReport.java
diff --git a/webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java b/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java
rename to webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java
diff --git a/webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/SurfaceViewRenderer.java
rename to webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
diff --git a/webrtc/api/java/src/org/webrtc/VideoCapturer.java b/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/VideoCapturer.java
rename to webrtc/api/android/java/src/org/webrtc/VideoCapturer.java
diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
rename to webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java
diff --git a/webrtc/api/java/src/org/webrtc/VideoRenderer.java b/webrtc/api/android/java/src/org/webrtc/VideoRenderer.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/VideoRenderer.java
rename to webrtc/api/android/java/src/org/webrtc/VideoRenderer.java
diff --git a/webrtc/api/java/android/org/webrtc/VideoRendererGui.java b/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java
similarity index 100%
rename from webrtc/api/java/android/org/webrtc/VideoRendererGui.java
rename to webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java
diff --git a/webrtc/api/java/src/org/webrtc/VideoSource.java b/webrtc/api/android/java/src/org/webrtc/VideoSource.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/VideoSource.java
rename to webrtc/api/android/java/src/org/webrtc/VideoSource.java
diff --git a/webrtc/api/java/src/org/webrtc/VideoTrack.java b/webrtc/api/android/java/src/org/webrtc/VideoTrack.java
similarity index 100%
rename from webrtc/api/java/src/org/webrtc/VideoTrack.java
rename to webrtc/api/android/java/src/org/webrtc/VideoTrack.java
diff --git a/webrtc/api/java/jni/OWNERS b/webrtc/api/android/jni/OWNERS
similarity index 100%
rename from webrtc/api/java/jni/OWNERS
rename to webrtc/api/android/jni/OWNERS
diff --git a/webrtc/api/java/jni/androidmediacodeccommon.h b/webrtc/api/android/jni/androidmediacodeccommon.h
similarity index 96%
rename from webrtc/api/java/jni/androidmediacodeccommon.h
rename to webrtc/api/android/jni/androidmediacodeccommon.h
index 4926f4d..4aa938d 100644
--- a/webrtc/api/java/jni/androidmediacodeccommon.h
+++ b/webrtc/api/android/jni/androidmediacodeccommon.h
@@ -15,8 +15,8 @@
#include <string>
#include "webrtc/base/thread.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/thread.h"
diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.cc b/webrtc/api/android/jni/androidmediadecoder_jni.cc
similarity index 98%
rename from webrtc/api/java/jni/androidmediadecoder_jni.cc
rename to webrtc/api/android/jni/androidmediadecoder_jni.cc
index 2ec222f..2a7e689 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.cc
+++ b/webrtc/api/android/jni/androidmediadecoder_jni.cc
@@ -14,15 +14,15 @@
// NOTICE: androidmediadecoder_jni.h must be included before
// androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/api/java/jni/androidmediadecoder_jni.h"
+#include "webrtc/api/android/jni/androidmediadecoder_jni.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/api/java/jni/androidmediacodeccommon.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/androidmediacodeccommon.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.h b/webrtc/api/android/jni/androidmediadecoder_jni.h
similarity index 96%
rename from webrtc/api/java/jni/androidmediadecoder_jni.h
rename to webrtc/api/android/jni/androidmediadecoder_jni.h
index 0719926..f8e8fa6 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.h
+++ b/webrtc/api/android/jni/androidmediadecoder_jni.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/android/jni/androidmediaencoder_jni.cc
similarity index 99%
rename from webrtc/api/java/jni/androidmediaencoder_jni.cc
rename to webrtc/api/android/jni/androidmediaencoder_jni.cc
index 2c50fe5..8d0d3b5 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.cc
@@ -10,7 +10,7 @@
// NOTICE: androidmediaencoder_jni.h must be included before
// androidmediacodeccommon.h to avoid build errors.
-#include "webrtc/api/java/jni/androidmediaencoder_jni.h"
+#include "webrtc/api/android/jni/androidmediaencoder_jni.h"
#include <algorithm>
#include <memory>
@@ -19,9 +19,9 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/api/java/jni/androidmediacodeccommon.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/androidmediacodeccommon.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/android/jni/androidmediaencoder_jni.h
similarity index 96%
rename from webrtc/api/java/jni/androidmediaencoder_jni.h
rename to webrtc/api/android/jni/androidmediaencoder_jni.h
index 4e50700..460eac3 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.h
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.h
@@ -13,7 +13,7 @@
#include <vector>
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/androidmetrics_jni.cc b/webrtc/api/android/jni/androidmetrics_jni.cc
similarity index 92%
rename from webrtc/api/java/jni/androidmetrics_jni.cc
rename to webrtc/api/android/jni/androidmetrics_jni.cc
index c4b3fd1..6e658c8 100644
--- a/webrtc/api/java/jni/androidmetrics_jni.cc
+++ b/webrtc/api/android/jni/androidmetrics_jni.cc
@@ -11,9 +11,9 @@
#include <map>
#include <memory>
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
// Enables collection of native histograms.
diff --git a/webrtc/api/java/jni/androidnetworkmonitor_jni.cc b/webrtc/api/android/jni/androidnetworkmonitor_jni.cc
similarity index 98%
rename from webrtc/api/java/jni/androidnetworkmonitor_jni.cc
rename to webrtc/api/android/jni/androidnetworkmonitor_jni.cc
index c109298..403badc 100644
--- a/webrtc/api/java/jni/androidnetworkmonitor_jni.cc
+++ b/webrtc/api/android/jni/androidnetworkmonitor_jni.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/java/jni/androidnetworkmonitor_jni.h"
+#include "webrtc/api/android/jni/androidnetworkmonitor_jni.h"
#include <dlfcn.h>
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/common.h"
#include "webrtc/base/ipaddress.h"
diff --git a/webrtc/api/java/jni/androidnetworkmonitor_jni.h b/webrtc/api/android/jni/androidnetworkmonitor_jni.h
similarity index 98%
rename from webrtc/api/java/jni/androidnetworkmonitor_jni.h
rename to webrtc/api/android/jni/androidnetworkmonitor_jni.h
index ff12abc..c8d7fcd 100644
--- a/webrtc/api/java/jni/androidnetworkmonitor_jni.h
+++ b/webrtc/api/android/jni/androidnetworkmonitor_jni.h
@@ -15,7 +15,7 @@
#include <map>
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/thread_checker.h"
diff --git a/webrtc/api/java/jni/androidvideocapturer_jni.cc b/webrtc/api/android/jni/androidvideocapturer_jni.cc
similarity index 98%
rename from webrtc/api/java/jni/androidvideocapturer_jni.cc
rename to webrtc/api/android/jni/androidvideocapturer_jni.cc
index 37b4a22..150f1c4 100644
--- a/webrtc/api/java/jni/androidvideocapturer_jni.cc
+++ b/webrtc/api/android/jni/androidvideocapturer_jni.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/java/jni/androidvideocapturer_jni.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/androidvideocapturer_jni.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "webrtc/base/bind.h"
diff --git a/webrtc/api/java/jni/androidvideocapturer_jni.h b/webrtc/api/android/jni/androidvideocapturer_jni.h
similarity index 98%
rename from webrtc/api/java/jni/androidvideocapturer_jni.h
rename to webrtc/api/android/jni/androidvideocapturer_jni.h
index 00c7d91..3d8db6e 100644
--- a/webrtc/api/java/jni/androidvideocapturer_jni.h
+++ b/webrtc/api/android/jni/androidvideocapturer_jni.h
@@ -15,7 +15,7 @@
#include <string>
#include "webrtc/api/androidvideocapturer.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/asyncinvoker.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h"
diff --git a/webrtc/api/java/jni/classreferenceholder.cc b/webrtc/api/android/jni/classreferenceholder.cc
similarity index 97%
rename from webrtc/api/java/jni/classreferenceholder.cc
rename to webrtc/api/android/jni/classreferenceholder.cc
index 3d8f304..be5cde2 100644
--- a/webrtc/api/java/jni/classreferenceholder.cc
+++ b/webrtc/api/android/jni/classreferenceholder.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/classreferenceholder.h b/webrtc/api/android/jni/classreferenceholder.h
similarity index 100%
rename from webrtc/api/java/jni/classreferenceholder.h
rename to webrtc/api/android/jni/classreferenceholder.h
diff --git a/webrtc/api/java/jni/jni_helpers.cc b/webrtc/api/android/jni/jni_helpers.cc
similarity index 98%
rename from webrtc/api/java/jni/jni_helpers.cc
rename to webrtc/api/android/jni/jni_helpers.cc
index 052dcf9..3bc0ff9 100644
--- a/webrtc/api/java/jni/jni_helpers.cc
+++ b/webrtc/api/android/jni/jni_helpers.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
#include <asm/unistd.h>
#include <sys/prctl.h>
diff --git a/webrtc/api/java/jni/jni_helpers.h b/webrtc/api/android/jni/jni_helpers.h
similarity index 100%
rename from webrtc/api/java/jni/jni_helpers.h
rename to webrtc/api/android/jni/jni_helpers.h
diff --git a/webrtc/api/java/jni/jni_onload.cc b/webrtc/api/android/jni/jni_onload.cc
similarity index 90%
rename from webrtc/api/java/jni/jni_onload.cc
rename to webrtc/api/android/jni/jni_onload.cc
index ef35d3c..092e5c7 100644
--- a/webrtc/api/java/jni/jni_onload.cc
+++ b/webrtc/api/android/jni/jni_onload.cc
@@ -12,8 +12,8 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/ssladapter.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/native_handle_impl.cc b/webrtc/api/android/jni/native_handle_impl.cc
similarity index 98%
rename from webrtc/api/java/jni/native_handle_impl.cc
rename to webrtc/api/android/jni/native_handle_impl.cc
index eb71088..f5076d6 100644
--- a/webrtc/api/java/jni/native_handle_impl.cc
+++ b/webrtc/api/android/jni/native_handle_impl.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include <memory>
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/keep_ref_until_done.h"
diff --git a/webrtc/api/java/jni/native_handle_impl.h b/webrtc/api/android/jni/native_handle_impl.h
similarity index 100%
rename from webrtc/api/java/jni/native_handle_impl.h
rename to webrtc/api/android/jni/native_handle_impl.h
diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/android/jni/peerconnection_jni.cc
similarity index 99%
rename from webrtc/api/java/jni/peerconnection_jni.cc
rename to webrtc/api/android/jni/peerconnection_jni.cc
index db89001..b92e31a 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/android/jni/peerconnection_jni.cc
@@ -45,13 +45,13 @@
#include "webrtc/api/androidvideocapturer.h"
#include "webrtc/api/dtlsidentitystore.h"
-#include "webrtc/api/java/jni/androidmediadecoder_jni.h"
-#include "webrtc/api/java/jni/androidmediaencoder_jni.h"
-#include "webrtc/api/java/jni/androidnetworkmonitor_jni.h"
-#include "webrtc/api/java/jni/androidvideocapturer_jni.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/androidmediadecoder_jni.h"
+#include "webrtc/api/android/jni/androidmediaencoder_jni.h"
+#include "webrtc/api/android/jni/androidnetworkmonitor_jni.h"
+#include "webrtc/api/android/jni/androidvideocapturer_jni.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include "webrtc/api/mediaconstraintsinterface.h"
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/rtpreceiverinterface.h"
diff --git a/webrtc/api/java/jni/surfacetexturehelper_jni.cc b/webrtc/api/android/jni/surfacetexturehelper_jni.cc
similarity index 95%
rename from webrtc/api/java/jni/surfacetexturehelper_jni.cc
rename to webrtc/api/android/jni/surfacetexturehelper_jni.cc
index 0cc0d79..29b20e1 100644
--- a/webrtc/api/java/jni/surfacetexturehelper_jni.cc
+++ b/webrtc/api/android/jni/surfacetexturehelper_jni.cc
@@ -9,9 +9,9 @@
*/
-#include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
+#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
diff --git a/webrtc/api/java/jni/surfacetexturehelper_jni.h b/webrtc/api/android/jni/surfacetexturehelper_jni.h
similarity index 95%
rename from webrtc/api/java/jni/surfacetexturehelper_jni.h
rename to webrtc/api/android/jni/surfacetexturehelper_jni.h
index 1d8bafc..5a28edc 100644
--- a/webrtc/api/java/jni/surfacetexturehelper_jni.h
+++ b/webrtc/api/android/jni/surfacetexturehelper_jni.h
@@ -13,8 +13,8 @@
#include <jni.h>
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include "webrtc/base/refcount.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
diff --git a/webrtc/api/androidvideocapturer.cc b/webrtc/api/androidvideocapturer.cc
index 22c7555..0bdf214 100644
--- a/webrtc/api/androidvideocapturer.cc
+++ b/webrtc/api/androidvideocapturer.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
#include "webrtc/base/common.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/media/engine/webrtcvideoframe.h"
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index 3ab0bf9..eb8c9c0 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -35,27 +35,27 @@
'libjingle_peerconnection',
],
'sources': [
+ 'android/jni/androidmediacodeccommon.h',
+ 'android/jni/androidmediadecoder_jni.cc',
+ 'android/jni/androidmediadecoder_jni.h',
+ 'android/jni/androidmediaencoder_jni.cc',
+ 'android/jni/androidmediaencoder_jni.h',
+ 'android/jni/androidmetrics_jni.cc',
+ 'android/jni/androidnetworkmonitor_jni.cc',
+ 'android/jni/androidnetworkmonitor_jni.h',
+ 'android/jni/androidvideocapturer_jni.cc',
+ 'android/jni/androidvideocapturer_jni.h',
+ 'android/jni/classreferenceholder.cc',
+ 'android/jni/classreferenceholder.h',
+ 'android/jni/jni_helpers.cc',
+ 'android/jni/jni_helpers.h',
+ 'android/jni/native_handle_impl.cc',
+ 'android/jni/native_handle_impl.h',
+ 'android/jni/peerconnection_jni.cc',
+ 'android/jni/surfacetexturehelper_jni.cc',
+ 'android/jni/surfacetexturehelper_jni.h',
'androidvideocapturer.cc',
'androidvideocapturer.h',
- 'java/jni/androidmediacodeccommon.h',
- 'java/jni/androidmediadecoder_jni.cc',
- 'java/jni/androidmediadecoder_jni.h',
- 'java/jni/androidmediaencoder_jni.cc',
- 'java/jni/androidmediaencoder_jni.h',
- 'java/jni/androidmetrics_jni.cc',
- 'java/jni/androidnetworkmonitor_jni.cc',
- 'java/jni/androidnetworkmonitor_jni.h',
- 'java/jni/androidvideocapturer_jni.cc',
- 'java/jni/androidvideocapturer_jni.h',
- 'java/jni/surfacetexturehelper_jni.cc',
- 'java/jni/surfacetexturehelper_jni.h',
- 'java/jni/classreferenceholder.cc',
- 'java/jni/classreferenceholder.h',
- 'java/jni/jni_helpers.cc',
- 'java/jni/jni_helpers.h',
- 'java/jni/native_handle_impl.cc',
- 'java/jni/native_handle_impl.h',
- 'java/jni/peerconnection_jni.cc',
],
'include_dirs': [
'<(libyuv_dir)/include',
@@ -83,7 +83,7 @@
'libjingle_peerconnection_jni',
],
'sources': [
- 'java/jni/jni_onload.cc',
+ 'android/jni/jni_onload.cc',
],
'variables': {
# This library uses native JNI exports; tell GYP so that the
diff --git a/webrtc/api/api_java.gyp b/webrtc/api/api_java.gyp
index e69f0e2..4e18035 100644
--- a/webrtc/api/api_java.gyp
+++ b/webrtc/api/api_java.gyp
@@ -34,14 +34,12 @@
'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
'chromium_code': 1,
- 'java_in_dir': 'java',
+ 'java_in_dir': 'android/java',
'webrtc_base_dir': '<(webrtc_root)/base',
'webrtc_modules_dir': '<(webrtc_root)/modules',
'additional_src_dirs' : [
- 'java/android',
- '<(webrtc_base_dir)/java/src',
+ '<(webrtc_base_dir)/java',
'<(webrtc_modules_dir)/audio_device/android/java/src',
-
],
},
'includes': ['../../build/java.gypi'],
diff --git a/webrtc/api/test/androidtestinitializer.cc b/webrtc/api/test/androidtestinitializer.cc
index 4816702..5fb86fe 100644
--- a/webrtc/api/test/androidtestinitializer.cc
+++ b/webrtc/api/test/androidtestinitializer.cc
@@ -19,8 +19,8 @@
#include "base/android/context_utils.h"
#include "base/android/jni_android.h"
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/ssladapter.h"
#include "webrtc/voice_engine/include/voe_base.h"