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..c39cc1451dd003c3108f8ad4ffab2cb067075e36 100644
--- a/webrtc/sdk/android/BUILD.gn
+++ b/webrtc/sdk/android/BUILD.gn
@@ -23,29 +23,70 @@ config("libjingle_peerconnection_jni_warnings_config") {
 }
 
 rtc_static_library("libjingle_peerconnection_jni") {
+  public_deps = [
+    ":base_jni",
+    ":webrtc_audio_jni",
+    ":webrtc_peerconnection_jni",
+    ":webrtc_video_jni",
+  ]
+}
+
+rtc_static_library("base_jni") {
   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") {

[sakal, 2017/05/26 08:16:13]

nit: I don't like webrtc_ prefix in any of the names. I don't think it serves
any purpose and is just redundant.

[kjellander_webrtc, 2017/05/29 20:59:15]

+1
let's at least use rtc_ instead, or nothing at all

[Zhi Huang, 2017/05/31 00:03:29]

Done.

[Zhi Huang, 2017/05/31 00:03:29]

Done.
I just not good at naming things. :)

+  deps = [
+    ":base_jni",
+    "../../pc:webrtc_audio",
+    "../../pc:webrtc_media",
+    "../../voice_engine:voice_engine",
+  ]
+}
+
+rtc_static_library("webrtc_null_audio_jni") {
+  deps = [
+    ":base_jni",
+    "../../pc:webrtc_null_audio",
+    "../../pc:webrtc_null_media",
+  ]
+}
+
+rtc_static_library("webrtc_video_jni") {
+  sources = [
+    "src/jni/androidhistogram_jni.cc",
     "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 +110,20 @@ rtc_static_library("libjingle_peerconnection_jni") {
   }
 
   deps = [
-    "../..:webrtc_common",
+    ":base_jni",
+    "../../api:libjingle_peerconnection_api",
     "../../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",

[kjellander_webrtc, 2017/05/29 20:59:15]

There's no reason to use relative mixed with absolute (but the pattern was
already established).
Since this code is not used from Chromium - could you convert all these paths to
be absolute? Same below.

[Zhi Huang, 2017/05/31 00:03:29]

Done.

   ]
 
   if (rtc_build_libyuv) {
@@ -96,6 +137,85 @@ rtc_static_library("libjingle_peerconnection_jni") {
   }
 }
 
+rtc_static_library("webrtc_null_video_jni") {
+  sources = [
+    "src/jni/null_video_jni.cc",
+  ]
+
+  deps = [
+    ":base_jni",
+    "../../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_peerconnection_jni") {
+  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 = [
+    ":base_jni",
+    "../..: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_peerconnection",
+    "../../system_wrappers:system_wrappers",
+  ]
+}
+
+rtc_static_library("webrtc_metrics_jni") {
+  sources = [
+    "src/jni/androidmetrics_jni.cc",
+  ]
+
+  configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
+
+  deps = [
+    ":base_jni",
+    ":webrtc_peerconnection_jni",
+    "../../pc:webrtc_peerconnection",
+    "../../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 +225,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") {

[Taylor Brandstetter, 2017/05/30 17:30:53]

Again, would be useful to have a comment that summarizes the various build
targets, and explains that this is an example of how the "null" targets are
used.

[Zhi Huang, 2017/05/31 00:03:29]

This is only for testing and it would be removed eventually. I'll add comments
in other places.

[kjellander_webrtc, 2017/06/01 05:34:30]

I think it's fine to leave the target uncommented. Otherwise it'll just break
quickly. That said, it needs to be dependent on somewhere in the dependency tree
from the //:default for that to happen. webrtc/sdk/android is a bit special in
that sense since it doesn't contain a group target named similar to the
directory that builds "everything we want" in the directory. See
https://cs.chromium.org/search/?q=f:src/third_party/webrtc+sdk/android+f:%5C....
for an overview of dependencies reaching into webrtc/sdk/android.
We should probably ensure we build more targets in a default build, but that can
be done in a follow-up CL.

[Zhi Huang, 2017/06/02 05:16:43]

Agree. We should have something to ensure that this won't be broken
accidentally. Since this datachannelonly target won't be build for now, I'll
leave it in the comment. We can uncomment this once we have more targets to
default build.

+  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 = [
+    ":base_jni",
+    ":webrtc_metrics_jni",
+    ":webrtc_null_audio_jni",
+    ":webrtc_null_video_jni",
+    ":webrtc_peerconnection_jni",
+    "../../base:rtc_base",
+    "../../pc:webrtc_peerconnection",
+  ]
+  output_extension = "so"
 }
 
 rtc_shared_library("libjingle_peerconnection_so") {