ae4b6ecf6f2b832e2c1750a081c4d35e1e565df9 - src/webrtc

commit	ae4b6ecf6f2b832e2c1750a081c4d35e1e565df9	[log] [tgz]
author	Sami Kalliomaki <sakal@webrtc.org>	Fri Jul 01 07:37:42 2016
committer	Sami Kalliomaki <sakal@webrtc.org>	Fri Jul 01 07:37:49 2016
tree	5731fce7ab94ab8bea05306b06fd31f300f72a39
parent	a7cc9b5b957420eef3c759ad1a6ca08fd5b509a7 [diff]

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

Review URL: https://codereview.webrtc.org/2106333005 .

Cr-Original-Commit-Position: refs/heads/master@{#13357}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 9b0dc622d46b6b09bb7ccaca6b2f68739c87ff8d

api/BUILD.gn[diff]
api/androidvideocapturer.cc[diff]
api/api.gyp[diff]
api/api_java.gyp[diff]
api/java/README[Renamed from api/android/README - diff]
api/java/android/org/webrtc/Camera1Enumerator.java[Renamed from api/android/java/src/org/webrtc/Camera1Enumerator.java - diff]
api/java/android/org/webrtc/Camera2Capturer.java[Renamed from api/android/java/src/org/webrtc/Camera2Capturer.java - diff]
api/java/android/org/webrtc/Camera2Enumerator.java[Renamed from api/android/java/src/org/webrtc/Camera2Enumerator.java - diff]
api/java/android/org/webrtc/CameraEnumerationAndroid.java[Renamed from api/android/java/src/org/webrtc/CameraEnumerationAndroid.java - diff]
api/java/android/org/webrtc/CameraEnumerator.java[Renamed from api/android/java/src/org/webrtc/CameraEnumerator.java - diff]
api/java/android/org/webrtc/CameraVideoCapturer.java[Renamed from api/android/java/src/org/webrtc/CameraVideoCapturer.java - diff]
api/java/android/org/webrtc/EglBase.java[Renamed from api/android/java/src/org/webrtc/EglBase.java - diff]
api/java/android/org/webrtc/EglBase10.java[Renamed from api/android/java/src/org/webrtc/EglBase10.java - diff]
api/java/android/org/webrtc/EglBase14.java[Renamed from api/android/java/src/org/webrtc/EglBase14.java - diff]
api/java/android/org/webrtc/GlRectDrawer.java[Renamed from api/android/java/src/org/webrtc/GlRectDrawer.java - diff]
api/java/android/org/webrtc/GlShader.java[Renamed from api/android/java/src/org/webrtc/GlShader.java - diff]
api/java/android/org/webrtc/GlTextureFrameBuffer.java[Renamed from api/android/java/src/org/webrtc/GlTextureFrameBuffer.java - diff]
api/java/android/org/webrtc/GlUtil.java[Renamed from api/android/java/src/org/webrtc/GlUtil.java - diff]
api/java/android/org/webrtc/NetworkMonitor.java[Renamed from api/android/java/src/org/webrtc/NetworkMonitor.java - diff]
api/java/android/org/webrtc/NetworkMonitorAutoDetect.java[Renamed from api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java - diff]
api/java/android/org/webrtc/OWNERS[Renamed from api/android/java/src/org/webrtc/OWNERS - diff]
api/java/android/org/webrtc/RendererCommon.java[Renamed from api/android/java/src/org/webrtc/RendererCommon.java - diff]
api/java/android/org/webrtc/SurfaceTextureHelper.java[Renamed from api/android/java/src/org/webrtc/SurfaceTextureHelper.java - diff]
api/java/android/org/webrtc/SurfaceViewRenderer.java[Renamed from api/android/java/src/org/webrtc/SurfaceViewRenderer.java - diff]
api/java/android/org/webrtc/VideoCapturerAndroid.java[Renamed from api/android/java/src/org/webrtc/VideoCapturerAndroid.java - diff]
api/java/android/org/webrtc/VideoRendererGui.java[Renamed from api/android/java/src/org/webrtc/VideoRendererGui.java - diff]
api/java/jni/OWNERS[Renamed from api/android/jni/OWNERS - diff]
api/java/jni/androidmediacodeccommon.h[Renamed from api/android/jni/androidmediacodeccommon.h - diff]
api/java/jni/androidmediadecoder_jni.cc[Renamed from api/android/jni/androidmediadecoder_jni.cc - diff]
api/java/jni/androidmediadecoder_jni.h[Renamed from api/android/jni/androidmediadecoder_jni.h - diff]
api/java/jni/androidmediaencoder_jni.cc[Renamed from api/android/jni/androidmediaencoder_jni.cc - diff]
api/java/jni/androidmediaencoder_jni.h[Renamed from api/android/jni/androidmediaencoder_jni.h - diff]
api/java/jni/androidmetrics_jni.cc[Renamed from api/android/jni/androidmetrics_jni.cc - diff]
api/java/jni/androidnetworkmonitor_jni.cc[Renamed from api/android/jni/androidnetworkmonitor_jni.cc - diff]
api/java/jni/androidnetworkmonitor_jni.h[Renamed from api/android/jni/androidnetworkmonitor_jni.h - diff]
api/java/jni/androidvideocapturer_jni.cc[Renamed from api/android/jni/androidvideocapturer_jni.cc - diff]
api/java/jni/androidvideocapturer_jni.h[Renamed from api/android/jni/androidvideocapturer_jni.h - diff]
api/java/jni/classreferenceholder.cc[Renamed from api/android/jni/classreferenceholder.cc - diff]
api/java/jni/classreferenceholder.h[Renamed from api/android/jni/classreferenceholder.h - diff]
api/java/jni/jni_helpers.cc[Renamed from api/android/jni/jni_helpers.cc - diff]
api/java/jni/jni_helpers.h[Renamed from api/android/jni/jni_helpers.h - diff]
api/java/jni/jni_onload.cc[Renamed from api/android/jni/jni_onload.cc - diff]
api/java/jni/native_handle_impl.cc[Renamed from api/android/jni/native_handle_impl.cc - diff]
api/java/jni/native_handle_impl.h[Renamed from api/android/jni/native_handle_impl.h - diff]
api/java/jni/peerconnection_jni.cc[Renamed from api/android/jni/peerconnection_jni.cc - diff]
api/java/jni/surfacetexturehelper_jni.cc[Renamed from api/android/jni/surfacetexturehelper_jni.cc - diff]
api/java/jni/surfacetexturehelper_jni.h[Renamed from api/android/jni/surfacetexturehelper_jni.h - diff]
api/java/src/org/webrtc/AudioSource.java[Renamed from api/android/java/src/org/webrtc/AudioSource.java - diff]
api/java/src/org/webrtc/AudioTrack.java[Renamed from api/android/java/src/org/webrtc/AudioTrack.java - diff]
api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java[Renamed from api/android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java - diff]
api/java/src/org/webrtc/DataChannel.java[Renamed from api/android/java/src/org/webrtc/DataChannel.java - diff]
api/java/src/org/webrtc/IceCandidate.java[Renamed from api/android/java/src/org/webrtc/IceCandidate.java - diff]
api/java/src/org/webrtc/MediaCodecVideoDecoder.java[Renamed from api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java - diff]
api/java/src/org/webrtc/MediaCodecVideoEncoder.java[Renamed from api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java - diff]
api/java/src/org/webrtc/MediaConstraints.java[Renamed from api/android/java/src/org/webrtc/MediaConstraints.java - diff]
api/java/src/org/webrtc/MediaSource.java[Renamed from api/android/java/src/org/webrtc/MediaSource.java - diff]
api/java/src/org/webrtc/MediaStream.java[Renamed from api/android/java/src/org/webrtc/MediaStream.java - diff]
api/java/src/org/webrtc/MediaStreamTrack.java[Renamed from api/android/java/src/org/webrtc/MediaStreamTrack.java - diff]
api/java/src/org/webrtc/Metrics.java[Renamed from api/android/java/src/org/webrtc/Metrics.java - diff]
api/java/src/org/webrtc/PeerConnection.java[Renamed from api/android/java/src/org/webrtc/PeerConnection.java - diff]
api/java/src/org/webrtc/PeerConnectionFactory.java[Renamed from api/android/java/src/org/webrtc/PeerConnectionFactory.java - diff]
api/java/src/org/webrtc/RtpParameters.java[Renamed from api/android/java/src/org/webrtc/RtpParameters.java - diff]
api/java/src/org/webrtc/RtpReceiver.java[Renamed from api/android/java/src/org/webrtc/RtpReceiver.java - diff]
api/java/src/org/webrtc/RtpSender.java[Renamed from api/android/java/src/org/webrtc/RtpSender.java - diff]
api/java/src/org/webrtc/SdpObserver.java[Renamed from api/android/java/src/org/webrtc/SdpObserver.java - diff]
api/java/src/org/webrtc/SessionDescription.java[Renamed from api/android/java/src/org/webrtc/SessionDescription.java - diff]
api/java/src/org/webrtc/StatsObserver.java[Renamed from api/android/java/src/org/webrtc/StatsObserver.java - diff]
api/java/src/org/webrtc/StatsReport.java[Renamed from api/android/java/src/org/webrtc/StatsReport.java - diff]
api/java/src/org/webrtc/VideoCapturer.java[Renamed from api/android/java/src/org/webrtc/VideoCapturer.java - diff]
api/java/src/org/webrtc/VideoRenderer.java[Renamed from api/android/java/src/org/webrtc/VideoRenderer.java - diff]
api/java/src/org/webrtc/VideoSource.java[Renamed from api/android/java/src/org/webrtc/VideoSource.java - diff]
api/java/src/org/webrtc/VideoTrack.java[Renamed from api/android/java/src/org/webrtc/VideoTrack.java - diff]
api/test/androidtestinitializer.cc[diff]

73 files changed

tree: 5731fce7ab94ab8bea05306b06fd31f300f72a39