Allow custom metrics implementations on Android.

webrtc/api/api.gyp

Index: webrtc/api/api.gyp
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index d017cda2d621f18b51e05a48ba8027ca580e9a7c..51d7e4affe82453ee3704de688baf2e0d23c2d3c 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -31,7 +31,6 @@
           'type': 'static_library',
           'dependencies': [
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',

[kjellander_webrtc, 2016/10/17 07:34:00]

This should be removed too.

[sakal, 2016/10/17 07:39:43]

Done.

-            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             'libjingle_peerconnection',
           ],
           'sources': [
@@ -40,7 +39,7 @@
             'android/jni/androidmediadecoder_jni.h',
             'android/jni/androidmediaencoder_jni.cc',
             'android/jni/androidmediaencoder_jni.h',
-            'android/jni/androidmetrics_jni.cc',
+            'android/jni/androidhistogram_jni.cc',
             'android/jni/androidnetworkmonitor_jni.cc',
             'android/jni/androidnetworkmonitor_jni.h',
             'android/jni/androidvideotracksource_jni.cc',
@@ -78,10 +77,12 @@
           'target_name': 'libjingle_peerconnection_so',
           'type': 'shared_library',
           'dependencies': [
+            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',

[kjellander_webrtc, 2016/10/17 07:34:00]

Add field_trial_default too.

[sakal, 2016/10/17 07:39:43]

Done.

             'libjingle_peerconnection',
             'libjingle_peerconnection_jni',
           ],
           'sources': [
+           'android/jni/androidmetrics_jni.cc',
            'android/jni/jni_onload.cc',
           ],
           'variables': {