Move /webrtc/api/android files to /webrtc/sdk/android

webrtc/api/BUILD.gn

Index: webrtc/api/BUILD.gn
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index b2f28ab4e2769faaf4963bb264a139eaf08aa2e6..20cf3fa2b6d4915bc9ca1f12c3b2271b345ffcc1 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -16,12 +16,6 @@ group("api") {
   public_deps = [
     ":libjingle_peerconnection",
   ]
-  if (is_android && !build_with_chromium) {
-    public_deps += [
-      ":libjingle_peerconnection_java",
-      ":libjingle_peerconnection_so",
-    ]
-  }
 }
 
 rtc_source_set("call_api") {
@@ -155,191 +149,6 @@ rtc_static_library("libjingle_peerconnection") {
   }
 }
 
-# Exclude the targets below from the Chromium build since they cannot be built
-# due to incompability with Chromium's logging implementation.
-if (is_android && !build_with_chromium) {
-  config("libjingle_peerconnection_jni_warnings_config") {
-    # The warnings below are enabled by default. Since GN orders compiler flags
-    # for a target before flags from configs, the only way to disable such
-    # warnings is by having them in a separate config, loaded from the target.
-    if (!is_win) {
-      cflags = [
-        "-Wno-sign-compare",
-        "-Wno-unused-variable",
-      ]
-    }
-  }
-
-  rtc_static_library("libjingle_peerconnection_jni") {
-    sources = [
-      "android/jni/androidhistogram_jni.cc",
-      "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/androidnetworkmonitor_jni.cc",
-      "android/jni/androidnetworkmonitor_jni.h",
-      "android/jni/androidvideotracksource.cc",
-      "android/jni/androidvideotracksource.h",
-      "android/jni/androidvideotracksource_jni.cc",
-      "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",
-    ]
-
-    configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
-
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [
-        "//build/config/clang:extra_warnings",
-        "//build/config/clang:find_bad_constructs",
-      ]
-    }
-
-    # TODO(jschuh): Bug 1348: fix this warning.
-    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
-    if (is_win) {
-      cflags += [
-        "/wd4245",  # conversion from "int" to "size_t", signed/unsigned mismatch.
-        "/wd4389",  # signed/unsigned mismatch.
-      ]
-    }
-
-    deps = [
-      ":libjingle_peerconnection",
-    ]
-
-    if (rtc_build_libyuv) {
-      deps += [ "$rtc_libyuv_dir" ]
-      public_deps = [
-        "$rtc_libyuv_dir",
-      ]
-    } else {
-      # Need to add a directory normally exported by libyuv.
-      include_dirs = [ "$rtc_libyuv_dir/include" ]
-    }
-  }
-
-  rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
-    sources = [
-      "android/jni/androidmetrics_jni.cc",
-    ]
-
-    configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
-
-    deps = [
-      ":libjingle_peerconnection",
-      "../system_wrappers:field_trial_default",
-      "../system_wrappers:metrics_default",
-    ]
-  }
-
-  rtc_shared_library("libjingle_peerconnection_so") {
-    sources = [
-      "android/jni/jni_onload.cc",
-    ]
-
-    suppressed_configs += [ "//build/config/android:hide_native_jni_exports" ]
-
-    deps = [
-      ":libjingle_peerconnection",
-      ":libjingle_peerconnection_jni",
-      ":libjingle_peerconnection_metrics_default_jni",
-    ]
-    output_extension = "so"
-  }
-}
-
-# Classes that don't require jni can be used in Chromium.
-if (is_android) {
-  android_library("libjingle_peerconnection_java") {
-    java_files = [
-      "../modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java",
-      "../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java",
-      "../modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java",
-      "../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",
-      "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/Camera1Capturer.java",
-      "android/java/src/org/webrtc/Camera1Enumerator.java",
-      "android/java/src/org/webrtc/Camera1Session.java",
-      "android/java/src/org/webrtc/Camera2Capturer.java",
-      "android/java/src/org/webrtc/Camera2Enumerator.java",
-      "android/java/src/org/webrtc/Camera2Session.java",
-      "android/java/src/org/webrtc/CameraCapturer.java",
-      "android/java/src/org/webrtc/CameraEnumerationAndroid.java",
-      "android/java/src/org/webrtc/CameraEnumerator.java",
-      "android/java/src/org/webrtc/CameraSession.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/EglRenderer.java",
-      "android/java/src/org/webrtc/FileVideoCapturer.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/Histogram.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/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/ScreenCapturerAndroid.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/VideoFileRenderer.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",
-      "android/java/src/org/webrtc/YuvConverter.java",
-    ]
-
-    deps = [
-      "../base:base_java",
-    ]
-  }
-
-  android_library("libjingle_peerconnection_metrics_default_java") {
-    java_files = [ "android/java/src/org/webrtc/Metrics.java" ]
-
-    deps = [
-      "../base:base_java",
-    ]
-  }
-}
-
 rtc_source_set("rtc_stats_api") {
   cflags = []
   sources = [
@@ -491,9 +300,9 @@ if (rtc_include_tests) {
         "test/androidtestinitializer.h",
       ]
       deps += [
-        ":libjingle_peerconnection_java",
-        ":libjingle_peerconnection_jni",
         "//testing/android/native_test:native_test_support",
+        "//webrtc/sdk/android:libjingle_peerconnection_java",
+        "//webrtc/sdk/android:libjingle_peerconnection_jni",
       ]
     }