Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: webrtc/api/api_tests.gyp

Issue 1915523002: Add a default implementation in metrics_default.cc of histograms methods in system_wrappers/interfac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 }], 93 }],
94 ['OS=="android"', { 94 ['OS=="android"', {
95 'sources': [ 95 'sources': [
96 'test/androidtestinitializer.cc', 96 'test/androidtestinitializer.cc',
97 'test/androidtestinitializer.h', 97 'test/androidtestinitializer.h',
98 ], 98 ],
99 'dependencies': [ 99 'dependencies': [
100 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 100 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
101 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_jni', 101 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_jni',
102 ], 102 ],
103 }, {
104 'dependencies': [
105 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
106 ],
103 }], 107 }],
104 ['OS=="win" and clang==1', { 108 ['OS=="win" and clang==1', {
105 'msvs_settings': { 109 'msvs_settings': {
106 'VCCLCompilerTool': { 110 'VCCLCompilerTool': {
107 'AdditionalOptions': [ 111 'AdditionalOptions': [
108 # Disable warnings failing when compiling with Clang on Windows. 112 # Disable warnings failing when compiling with Clang on Windows.
109 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 113 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
110 '-Wno-sign-compare', 114 '-Wno-sign-compare',
111 '-Wno-unused-function', 115 '-Wno-unused-function',
112 ], 116 ],
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 '../build/isolate.gypi', 190 '../build/isolate.gypi',
187 ], 191 ],
188 'sources': [ 192 'sources': [
189 'peerconnection_unittests.isolate', 193 'peerconnection_unittests.isolate',
190 ], 194 ],
191 }, 195 },
192 ], # targets 196 ], # targets
193 }], # test_isolation_mode != "noop" 197 }], # test_isolation_mode != "noop"
194 ], # conditions 198 ], # conditions
195 } 199 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698