Build WebRTC with data channel only.

webrtc/sdk/android/BUILD.gn

Index: webrtc/sdk/android/BUILD.gn
diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn
index 9fcedf907b7a5ce823aba7d243ef468c458179b3..43cb4fd9db6612f17b51d869ffccb128041e473c 100644
--- a/webrtc/sdk/android/BUILD.gn
+++ b/webrtc/sdk/android/BUILD.gn
@@ -23,29 +23,69 @@ config("libjingle_peerconnection_jni_warnings_config") {
 }
 
 rtc_static_library("libjingle_peerconnection_jni") {
+  public_deps = [
+    ":webrtc_audio_jni",
+    ":webrtc_base_jni",
+    ":webrtc_jni_common",
+    ":webrtc_video_jni",
+  ]
+}
+
+rtc_static_library("webrtc_jni_common") {

[sakal, 2017/05/23 09:33:18]

nit: Why do this targets begin with webrtc_, isn't it a little redundant?

I would also prefer this be called base_jni to be consistent with general
naming.

i.e //base:base and //base:base_java

[Zhi Huang, 2017/05/23 18:49:45]

I just tried to match the naming of the targets in pc/ directory. Your
suggestion sounds better. I'll change them.

   sources = [
-    "src/jni/androidhistogram_jni.cc",
     "src/jni/androidmediacodeccommon.h",
+    "src/jni/classreferenceholder.cc",
+    "src/jni/classreferenceholder.h",
+    "src/jni/jni_helpers.cc",
+    "src/jni/jni_helpers.h",
+  ]
+
+  deps = [
+    "../../base:rtc_base",
+    "../../base:rtc_base_approved",
+  ]
+
+  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("webrtc_audio_jni") {
+  deps = [
+    ":webrtc_jni_common",
+    "../../pc:webrtc_audio",
+    "../../pc:webrtc_media",
+    "../../voice_engine:voice_engine",
+  ]
+}
+
+rtc_static_library("webrtc_null_audio_jni") {
+  deps = [
+    ":webrtc_jni_common",
+    "../../pc:webrtc_null_audio",
+    "../../pc:webrtc_null_media",
+  ]
+}
+
+rtc_static_library("webrtc_video_jni") {
+  sources = [
+    "src/jni/androidhistogram_jni.cc",

[sakal, 2017/05/23 09:33:19]

Maybe we should move these files to separate subfolders and enforce dependencies
with DEPS files?

[Zhi Huang, 2017/05/23 18:49:45]

Do you mean move these files to a new directory (like /jni/video/)? Can we do
that in a separate CL?

     "src/jni/androidmediadecoder_jni.cc",
     "src/jni/androidmediadecoder_jni.h",
     "src/jni/androidmediaencoder_jni.cc",
     "src/jni/androidmediaencoder_jni.h",
-    "src/jni/androidnetworkmonitor_jni.cc",
-    "src/jni/androidnetworkmonitor_jni.h",
     "src/jni/androidvideotracksource.cc",
     "src/jni/androidvideotracksource.h",
-    "src/jni/androidvideotracksource_jni.cc",
-    "src/jni/classreferenceholder.cc",
-    "src/jni/classreferenceholder.h",
-    "src/jni/jni_helpers.cc",
-    "src/jni/jni_helpers.h",
     "src/jni/native_handle_impl.cc",
     "src/jni/native_handle_impl.h",
-    "src/jni/peerconnection_jni.cc",
-    "src/jni/rtcstatscollectorcallbackwrapper.cc",
-    "src/jni/rtcstatscollectorcallbackwrapper.h",
     "src/jni/surfacetexturehelper_jni.cc",
     "src/jni/surfacetexturehelper_jni.h",
+    "src/jni/video_jni.cc",
+    "src/jni/video_renderer_jni.cc",
   ]
 
   configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
@@ -69,20 +109,19 @@ rtc_static_library("libjingle_peerconnection_jni") {
   }
 
   deps = [
-    "../..:webrtc_common",
+    ":webrtc_jni_common",
     "../../api:video_frame_api",
     "../../api/video_codecs:video_codecs_api",
     "../../base:rtc_base",
     "../../base:rtc_base_approved",
     "../../base:rtc_task_queue",
     "../../common_video:common_video",
-    "../../media:rtc_media",
-    "../../media:rtc_media_base",
-    "../../modules/utility:utility",
+    "../../media:rtc_audio_video",
+    "../../media:rtc_media_data_base",
     "../../modules/video_coding:video_coding_utility",
+    "../../pc:webrtc_media",
     "../../system_wrappers:system_wrappers",
-    "../../voice_engine:voice_engine",
-    "//webrtc/pc:libjingle_peerconnection",
+    "//webrtc:webrtc_common",
   ]
 
   if (rtc_build_libyuv) {
@@ -96,6 +135,85 @@ rtc_static_library("libjingle_peerconnection_jni") {
   }
 }
 
+rtc_static_library("webrtc_null_video_jni") {
+  sources = [
+    "src/jni/null_video_jni.cc",
+  ]
+
+  deps = [
+    ":webrtc_jni_common",
+    "../../pc:webrtc_null_media",
+  ]
+
+  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("webrtc_base_jni") {

[sakal, 2017/05/23 09:33:18]

nit: Perhaps webrtc_peerconnection_jni

[Zhi Huang, 2017/05/23 18:49:45]

Done.

+  sources = [
+    "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",
+    ]
+  }
+
+  # 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 = [
+    ":webrtc_jni_common",
+    "../..:webrtc_common",
+    "../../base:rtc_base",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_task_queue",
+    "../../media:rtc_data",
+    "../../media:rtc_media_data_base",
+    "../../modules/utility:utility",
+    "../../pc:webrtc_base",
+    "../../system_wrappers:system_wrappers",
+  ]
+}
+
+rtc_static_library("webrtc_base_metrics_default_jni") {

[sakal, 2017/05/23 09:33:19]

Can this be renamed to webrtc_metrics_jni?

[Zhi Huang, 2017/05/23 18:49:45]

Done.

+  sources = [
+    "src/jni/androidmetrics_jni.cc",
+  ]
+
+  configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
+
+  deps = [
+    ":webrtc_base_jni",
+    ":webrtc_jni_common",
+    "../../pc:webrtc_base",
+    "../../system_wrappers",
+    "../../system_wrappers:field_trial_default",
+    "../../system_wrappers:metrics_default",
+  ]
+}
+
 rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
   sources = [
     "src/jni/androidmetrics_jni.cc",
@@ -105,11 +223,31 @@ rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
 
   deps = [
     ":libjingle_peerconnection_jni",
+    "../../pc:libjingle_peerconnection",
     "../../system_wrappers",
-    "//webrtc/pc:libjingle_peerconnection",
-    "//webrtc/system_wrappers:field_trial_default",
-    "//webrtc/system_wrappers:metrics_default",
+    "../../system_wrappers:field_trial_default",
+    "../../system_wrappers:metrics_default",
+  ]
+}
+
+rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {

[sakal, 2017/05/23 09:33:18]

Is this target necessary, can't clients create it themselves?

[Zhi Huang, 2017/05/23 18:49:45]

You're right. The idea is letting the clients create the targets them need. 

This is for testing and I'll remove it before submitting.

+  sources = [
+    "src/jni/jni_onload.cc",
   ]
+
+  suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
+  configs += [ "//build/config/android:hide_all_but_jni" ]
+
+  deps = [
+    ":webrtc_base_jni",
+    ":webrtc_base_metrics_default_jni",
+    ":webrtc_jni_common",
+    ":webrtc_null_audio_jni",
+    ":webrtc_null_video_jni",
+    "../../base:rtc_base",
+    "../../pc:webrtc_base",
+  ]
+  output_extension = "so"
 }
 
 rtc_shared_library("libjingle_peerconnection_so") {