Support building WebRTC without audio and video for Android

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/webrtc.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
 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") {
+rtc_static_library("base_jni") {

[Taylor Brandstetter, 2017/06/16 22:19:08]

May want to make these rtc_source_sets

[Zhi Huang, 2017/06/17 01:46:43]

Done.

+  sources = [
+    "src/jni/androidmediacodeccommon.h",
+    "src/jni/classreferenceholder.cc",
+    "src/jni/classreferenceholder.h",
+    "src/jni/jni_helpers.cc",
+    "src/jni/jni_helpers.h",
+    "src/jni/ownedfactoryandthreads.cc",
+    "src/jni/ownedfactoryandthreads.h",
+  ]
+
+  deps = [
+    "//webrtc/api:libjingle_peerconnection_api",
+    "//webrtc/base:rtc_base",
+    "//webrtc/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("audio_jni") {
+  deps = [
+    ":base_jni",
+    "//webrtc/voice_engine:voice_engine",
+  ]
+}
+
+rtc_static_library("null_audio_jni") {
+  sources = [
+    "src/jni/null_audio_jni.cc",
+  ]
+
+  deps = [
+    "//webrtc/api:audio_mixer_api",
+    "//webrtc/api:libjingle_peerconnection_api",
+    "//webrtc/base:rtc_base",
+    "//webrtc/base:rtc_base_approved",
+    "//webrtc/call:call_interfaces",
+    "//webrtc/logging:rtc_event_log_api",
+  ]
+}
+
+rtc_static_library("video_jni") {
   sources = [
     "src/jni/androidhistogram_jni.cc",
-    "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/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",
     "src/jni/wrapped_native_i420_buffer.cc",
     "src/jni/wrapped_native_i420_buffer.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_common",
-    "../../api:video_frame_api",
-    "../../api/video_codecs:video_codecs_api",
-    "../../base:rtc_base",
-    "../../base:rtc_base_approved",
-    "../../base:rtc_task_queue",
-    "../../base:sequenced_task_checker",
-    "../../base:weak_ptr",
-    "../../common_video:common_video",
-    "../../media:rtc_media",
-    "../../media:rtc_media_base",
-    "../../modules/utility:utility",
-    "../../modules/video_coding:video_coding_utility",
-    "../../system_wrappers:system_wrappers",
-    "../../voice_engine:voice_engine",
-    "//webrtc/pc:libjingle_peerconnection",
+    ":base_jni",
+    "//webrtc:webrtc_common",
+    "//webrtc/api:libjingle_peerconnection_api",
+    "//webrtc/api:video_frame_api",
+    "//webrtc/api/video_codecs:video_codecs_api",
+    "//webrtc/base:rtc_base",
+    "//webrtc/base:rtc_base_approved",
+    "//webrtc/base:rtc_task_queue",
+    "//webrtc/base:sequenced_task_checker",
+    "//webrtc/base:weak_ptr",
+    "//webrtc/common_video:common_video",
+    "//webrtc/media:rtc_audio_video",
+    "//webrtc/media:rtc_media_base",
+    "//webrtc/modules/utility:utility",
+    "//webrtc/modules/video_coding:video_coding_utility",
+    "//webrtc/system_wrappers:system_wrappers",
   ]
 
   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("null_video_jni") {
+  sources = [
+    "src/jni/null_video_jni.cc",
+  ]
+
+  deps = [
+    ":base_jni",
+    "//webrtc/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("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",
+    "//webrtc/base:rtc_base",
+    "//webrtc/base:rtc_base_approved",
+    "//webrtc/base:rtc_task_queue",
+    "//webrtc/media:rtc_data",
+    "//webrtc/media:rtc_media_base",
+    "//webrtc/modules/utility:utility",
+    "//webrtc/pc:peerconnection",
+    "//webrtc/system_wrappers:system_wrappers",
+  ]
+}
+
+rtc_static_library("libjingle_peerconnection_jni") {
+  public_deps = [
+    ":audio_jni",
+    ":base_jni",
+    ":peerconnection_jni",
+    ":video_jni",
+    "//webrtc/pc:create_pc_factory",
+  ]
+}
+
+rtc_static_library("metrics_jni") {

[Taylor Brandstetter, 2017/06/16 22:19:08]

Do we need the two "metrics_jni" targets? It seems like we could just use the
existing one, and change its dependencies from
"libjingle_peerconnection/libjingle_peerconnection_jni" to
"peerconnection/peerconnection_jni".

[Zhi Huang, 2017/06/17 01:46:43]

Done.

+  sources = [
+    "src/jni/androidmetrics_jni.cc",
+  ]
+
+  configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
+
+  deps = [
+    ":base_jni",
+    ":peerconnection_jni",
+    "//webrtc/pc:peerconnection",
+    "//webrtc/system_wrappers",
+    "//webrtc/system_wrappers:field_trial_default",
+    "//webrtc/system_wrappers:metrics_default",
+  ]
+}
+
 rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
   sources = [
     "src/jni/androidmetrics_jni.cc",
   ]
 
   configs += [ ":libjingle_peerconnection_jni_warnings_config" ]
 
   deps = [
     ":libjingle_peerconnection_jni",
-    "../../system_wrappers",
     "//webrtc/pc:libjingle_peerconnection",
+    "//webrtc/system_wrappers",
     "//webrtc/system_wrappers:field_trial_default",
     "//webrtc/system_wrappers:metrics_default",
   ]
 }
 
+# The modular build targets can be used to build WebRTC with different
+# functionalities. The users can choose either the real implemenation or the
+# null implementation of the audio/video modules based on their requirments.
+#
+# For example, to build WebRTC with datachannel support only, we would need the
+# the peerconnection and the null implementation of the audio and video module.
+# rtc_shared_library("libjingle_peerconnection_datachannelonly_so") {
+#  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",
+#    ":metrics_jni",
+#    ":null_audio_jni",
+#    ":null_video_jni",
+#    ":peerconnection_jni",
+#    "//webrtc/base:rtc_base",
+#    "//webrtc/base:rtc_base_approved",
+#    "//webrtc/pc:peerconnection",
+#  ]
+#  output_extension = "so"
+# }

[Taylor Brandstetter, 2017/06/16 22:19:08]

May want to mention that this is still under development, and that some things
(such as "null_audio_jni" with "video_jni") won't work.

[Zhi Huang, 2017/06/17 01:46:43]

I'll try to remove the limitation.

+
 rtc_shared_library("libjingle_peerconnection_so") {
   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 = [
     ":libjingle_peerconnection_jni",
     ":libjingle_peerconnection_metrics_default_jni",
-    "../../base:rtc_base",
+    "//webrtc/base:rtc_base",
     "//webrtc/pc:libjingle_peerconnection",
   ]
   output_extension = "so"
 }
 
 dist_jar("libwebrtc") {
   _target_dir_name = get_label_info(":$target_name", "dir")
   output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar"
   direct_deps_only = true
   use_interface_jars = false
@@ skipping 132 matching lines @@
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",
       "//webrtc/base:base_java",
       "//webrtc/sdk/android:libjingle_peerconnection_java",
       "//webrtc/sdk/android:libjingle_peerconnection_metrics_default_java",
     ]
 
     shared_libraries = [ "//webrtc/sdk/android:libjingle_peerconnection_so" ]
   }
 }