Revert of Break peerconnection_jni.cc into multiple files, in "pc" directory.

webrtc/sdk/android/BUILD.gn

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../webrtc.gni")
 import("//build/config/android/config.gni")
@@ skipping 18 matching lines @@
     cflags = [
       "-Wno-sign-compare",
       "-Wno-unused-variable",
     ]
   }
 }
 
 rtc_source_set("base_jni") {
   sources = [
     "src/jni/androidhistogram_jni.cc",
+    "src/jni/audio_jni.h",
     "src/jni/classreferenceholder.cc",
     "src/jni/classreferenceholder.h",
     "src/jni/jni_helpers.cc",
     "src/jni/jni_helpers.h",
-    "src/jni/pc/audio_jni.h",
-    "src/jni/pc/media_jni.h",
-    "src/jni/pc/video_jni.h",
+    "src/jni/media_jni.h",
+    "src/jni/ownedfactoryandthreads.cc",
+    "src/jni/ownedfactoryandthreads.h",
+    "src/jni/video_jni.h",
   ]
 
   deps = [
     "../../api:libjingle_peerconnection_api",
     "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:metrics_api",
   ]
 
   if (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",
     ]
   }
 }
 
 rtc_static_library("audio_jni") {
   sources = [
-    "src/jni/pc/audio_jni.cc",
+    "src/jni/audio_jni.cc",
   ]
 
   deps = [
     ":base_jni",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../api/audio_codecs:builtin_audio_encoder_factory",
     "../../voice_engine:voice_engine",
   ]
 }
 
 rtc_static_library("null_audio_jni") {
   sources = [
-    "src/jni/pc/null_audio_jni.cc",
+    "src/jni/null_audio_jni.cc",
   ]
 
   deps = [
     ":base_jni",
   ]
 }
 
 rtc_static_library("video_jni") {
   sources = [
     "src/jni/androidmediacodeccommon.h",
     "src/jni/androidmediadecoder_jni.cc",
     "src/jni/androidmediadecoder_jni.h",
     "src/jni/androidmediaencoder_jni.cc",
     "src/jni/androidmediaencoder_jni.h",
     "src/jni/androidvideotracksource.cc",
     "src/jni/androidvideotracksource.h",
     "src/jni/androidvideotracksource_jni.cc",
     "src/jni/filevideocapturer_jni.cc",
     "src/jni/native_handle_impl.cc",
     "src/jni/native_handle_impl.h",
-    "src/jni/pc/video_jni.cc",
     "src/jni/surfacetexturehelper_jni.cc",
     "src/jni/surfacetexturehelper_jni.h",
+    "src/jni/video_jni.cc",
     "src/jni/video_renderer_jni.cc",
     "src/jni/videodecoderfactorywrapper.cc",
     "src/jni/videodecoderfactorywrapper.h",
     "src/jni/videodecoderwrapper.cc",
     "src/jni/videodecoderwrapper.h",
     "src/jni/videofilerenderer_jni.cc",
     "src/jni/videoframe_jni.cc",
     "src/jni/videotrack_jni.cc",
     "src/jni/wrapped_native_i420_buffer.cc",
     "src/jni/wrapped_native_i420_buffer.h",
@@ skipping 14 matching lines @@
 
   if (is_win) {
     cflags += [
       "/wd4245",  # conversion from "int" to "size_t", signed/unsigned mismatch.
       "/wd4389",  # signed/unsigned mismatch.
     ]
   }
 
   deps = [
     ":base_jni",
-    ":peerconnection_jni",
     "../..:webrtc_common",
     "../../api:libjingle_peerconnection_api",
     "../../api:video_frame_api",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video:common_video",
     "../../media:rtc_audio_video",
     "../../media:rtc_media_base",
     "../../modules/utility:utility",
     "../../modules/video_coding:video_coding_utility",
     "../../rtc_base:rtc_base",
@@ skipping 10 matching lines @@
       "$rtc_libyuv_dir",
     ]
   } else {
     # Need to add a directory normally exported by libyuv.
     include_dirs = [ "$rtc_libyuv_dir/include" ]
   }
 }
 
 rtc_static_library("null_video_jni") {
   sources = [
-    "src/jni/pc/null_video_jni.cc",
+    "src/jni/null_video_jni.cc",
   ]
 
   deps = [
     ":base_jni",
   ]
 }
 
 rtc_static_library("media_jni") {
   sources = [
-    "src/jni/pc/media_jni.cc",
+    "src/jni/media_jni.cc",
   ]
 
   deps = [
     ":base_jni",
     "../../call:call_interfaces",
     "../../logging:rtc_event_log_api",
     "../../media:rtc_audio_video",
     "../../modules/audio_processing:audio_processing",
   ]
 
   if (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",
     ]
   }
 }
 
 rtc_static_library("null_media_jni") {
   sources = [
-    "src/jni/pc/null_media_jni.cc",
+    "src/jni/null_media_jni.cc",
   ]
 
   deps = [
     ":base_jni",
   ]
 }
 
 rtc_static_library("peerconnection_jni") {
   sources = [
-    "src/jni/pc/androidnetworkmonitor_jni.cc",
-    "src/jni/pc/androidnetworkmonitor_jni.h",
-    "src/jni/pc/audiotrack_jni.cc",
-    "src/jni/pc/callsessionfilerotatinglogsink_jni.cc",
-    "src/jni/pc/datachannel_jni.cc",
-    "src/jni/pc/datachannelobserver_jni.cc",
-    "src/jni/pc/datachannelobserver_jni.h",
-    "src/jni/pc/dtmfsender_jni.cc",
-    "src/jni/pc/java_native_conversion.cc",
-    "src/jni/pc/java_native_conversion.h",
-    "src/jni/pc/logging_jni.cc",
-    "src/jni/pc/mediaconstraints_jni.cc",
-    "src/jni/pc/mediaconstraints_jni.h",
-    "src/jni/pc/mediasource_jni.cc",
-    "src/jni/pc/mediastream_jni.cc",
-    "src/jni/pc/mediastreamtrack_jni.cc",
-    "src/jni/pc/ownedfactoryandthreads.cc",
-    "src/jni/pc/ownedfactoryandthreads.h",
-    "src/jni/pc/peerconnection_jni.cc",
-    "src/jni/pc/peerconnectionfactory_jni.cc",
-    "src/jni/pc/peerconnectionobserver_jni.cc",
-    "src/jni/pc/peerconnectionobserver_jni.h",
-    "src/jni/pc/rtcstatscollectorcallbackwrapper.cc",
-    "src/jni/pc/rtcstatscollectorcallbackwrapper.h",
-    "src/jni/pc/rtpreceiver_jni.cc",
-    "src/jni/pc/rtpreceiverobserver_jni.cc",
-    "src/jni/pc/rtpreceiverobserver_jni.h",
-    "src/jni/pc/rtpsender_jni.cc",
-    "src/jni/pc/sdpobserver_jni.h",
-    "src/jni/pc/statsobserver_jni.cc",
-    "src/jni/pc/statsobserver_jni.h",
+    "src/jni/androidnetworkmonitor_jni.cc",
+    "src/jni/androidnetworkmonitor_jni.h",
+    "src/jni/peerconnection_jni.cc",
+    "src/jni/rtcstatscollectorcallbackwrapper.cc",
+    "src/jni/rtcstatscollectorcallbackwrapper.h",
   ]
 
   configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
 
   if (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",
     ]
@@ skipping 240 matching lines @@
       "//base:base_java",
       "//base:base_java_test_support",
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",
     ]
 
     shared_libraries = [ "../../sdk/android:libjingle_peerconnection_so" ]
   }
 }