Allow custom metrics implementations on Android.

webrtc/api/api.gyp

 # 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.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 12 matching lines @@
       ],
     }],
     # Excluded from the Chromium build since they cannot be built due to
     # incompability with Chromium's logging implementation.
     ['OS=="android" and build_with_chromium==0', {
       'targets': [
         {
           'target_name': 'libjingle_peerconnection_jni',
           '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': [
             '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/androidhistogram_jni.cc',
             'android/jni/androidnetworkmonitor_jni.cc',
             'android/jni/androidnetworkmonitor_jni.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',
             'android/jni/native_handle_impl.h',
             'android/jni/peerconnection_jni.cc',
@@ skipping 17 matching lines @@
           'msvs_disabled_warnings': [
             4245,  # conversion from 'int' to 'size_t', signed/unsigned mismatch.
             4267,  # conversion from 'size_t' to 'int', possible loss of data.
             4389,  # signed/unsigned mismatch.
           ],
         },
         {
           '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': {
             # This library uses native JNI exports; tell GYP so that the
             # required symbols will be kept.
             'use_native_jni_exports': 1,
           },
         },
       ]
     }],
@@ skipping 131 matching lines @@
         '<(webrtc_root)/base/base.gyp:rtc_base_approved',
       ],
       'sources': [
         'stats/rtcstats.h',
         'stats/rtcstats_objects.h',
         'stats/rtcstatsreport.h',
       ],
     },  # target rtc_stats_api
   ],  # targets
 }