Allow custom metrics implementations on Android.

webrtc/api/BUILD.gn

Index: webrtc/api/BUILD.gn
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index 16bbffda354dfbfee26182815a12b71c3338533a..40177885375a07d54a38a8b7c28b0924f399a020 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -162,12 +162,12 @@ if (is_android && !build_with_chromium) {
 
   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_jni.cc",
@@ -206,8 +206,6 @@ if (is_android && !build_with_chromium) {
 
     deps = [
       ":libjingle_peerconnection",
-      "../system_wrappers:field_trial_default",
-      "../system_wrappers:metrics_default",
     ]
 
     if (rtc_build_libyuv) {
@@ -223,6 +221,7 @@ if (is_android && !build_with_chromium) {
 
   rtc_shared_library("libjingle_peerconnection_so") {
     sources = [
+      "android/jni/androidmetrics_jni.cc",
       "android/jni/jni_onload.cc",
     ]
 
@@ -231,6 +230,8 @@ if (is_android && !build_with_chromium) {
     deps = [
       ":libjingle_peerconnection",
       ":libjingle_peerconnection_jni",
+      "../system_wrappers:field_trial_default",
+      "../system_wrappers:metrics_default",
     ]
     output_extension = "so"
   }
@@ -265,6 +266,7 @@ if (is_android && !build_with_chromium) {
       "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",
@@ -272,7 +274,6 @@ if (is_android && !build_with_chromium) {
       "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",
@@ -299,6 +300,14 @@ if (is_android && !build_with_chromium) {
       "//webrtc/base:base_java",
     ]
   }
+
+  android_library("libjingle_peerconnection_metrics_default_java") {
+    java_files = [ "android/java/src/org/webrtc/Metrics.java" ]
+
+    deps = [
+      "//webrtc/base:base_java",
+    ]
+  }
 }
 
 # GYP version: webrtc/api/api.gyp:rtc_stats_api
@@ -413,8 +422,9 @@ if (rtc_include_tests) {
         "test/androidtestinitializer.h",
       ]
       deps += [
-        ":libjingle_peerconnection_java",
         ":libjingle_peerconnection_jni",
+        "../system_wrappers:field_trial_default",
+        "../system_wrappers:metrics_default",
         "//testing/android/native_test:native_test_support",
       ]
     }
@@ -458,6 +468,7 @@ if (rtc_include_tests) {
       deps = [
         ":libjingle_peerconnection_android_unittest_resources",
         ":libjingle_peerconnection_java",
+        ":libjingle_peerconnection_metrics_default_java",
         "//base:base_java",
         "//webrtc/base:base_java",
       ]