Reland of Allow custom metrics implementations on Android.

webrtc/api/BUILD.gn

 # Copyright (c) 2015 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("../build/webrtc.gni")
 if (is_android) {
@@ skipping 153 matching lines @@
     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/androidmetrics_jni.cc",
       "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",
@@ skipping 18 matching lines @@
 
     if (is_win) {
       cflags += [
         "/wd4245",  # conversion from "int" to "size_t", signed/unsigned mismatch.
         "/wd4389",  # signed/unsigned mismatch.
       ]
     }
 
     deps = [
       ":libjingle_peerconnection",
-      "../system_wrappers:field_trial_default",
-      "../system_wrappers:metrics_default",
     ]
 
     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",
@@ skipping 19 matching lines @@
       "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/Metrics.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 = [
     "stats/rtcstats.h",
     "stats/rtcstats_objects.h",
     "stats/rtcstatsreport.h",
   ]
 
@@ skipping 164 matching lines @@
         "androidtests/src/org/webrtc/NetworkMonitorTest.java",
         "androidtests/src/org/webrtc/PeerConnectionTest.java",
         "androidtests/src/org/webrtc/RendererCommonTest.java",
         "androidtests/src/org/webrtc/SurfaceTextureHelperTest.java",
         "androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java",
         "androidtests/src/org/webrtc/WebRtcJniBootTest.java",
       ]
 
       deps = [
         ":libjingle_peerconnection_java",
+        ":libjingle_peerconnection_metrics_default_java",
         "../base:base_java",
         "//base:base_java",
       ]
 
       shared_libraries = [ ":libjingle_peerconnection_so" ]
     }
   }
 }