Revert of 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 ee64e609df2d1521904fb382a0e3a709f3577e9d..01aacb745928c2f1ed09e47a6e4dd577084b31ff 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -171,12 +171,12 @@
 
   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",
@@ -215,6 +215,8 @@
 
     deps = [
       ":libjingle_peerconnection",
+      "../system_wrappers:field_trial_default",
+      "../system_wrappers:metrics_default",
     ]
 
     if (rtc_build_libyuv) {
@@ -228,20 +230,6 @@
     }
   }
 
-  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",
@@ -252,7 +240,6 @@
     deps = [
       ":libjingle_peerconnection",
       ":libjingle_peerconnection_jni",
-      ":libjingle_peerconnection_metrics_default_jni",
     ]
     output_extension = "so"
   }
@@ -292,7 +279,6 @@
       "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",
@@ -300,6 +286,7 @@
       "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",
@@ -327,14 +314,6 @@
 
     deps = [
       "../base:base_java",
-    ]
-  }
-
-  android_library("libjingle_peerconnection_metrics_default_java") {
-    java_files = [ "android/java/src/org/webrtc/Metrics.java" ]
-
-    deps = [
-      "//webrtc/base:base_java",
     ]
   }
 }
@@ -506,7 +485,6 @@
 
       deps = [
         ":libjingle_peerconnection_java",
-        ":libjingle_peerconnection_metrics_default_java",
         "../base:base_java",
         "//base:base_java",
       ]