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

Side by Side Diff: webrtc/sdk/sdk.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 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright 2016 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': [ 10 'includes': [
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 ], 69 ],
70 }], 70 }],
71 ], 71 ],
72 }, 72 },
73 { 73 {
74 'target_name': 'rtc_sdk_peerconnection_objc', 74 'target_name': 'rtc_sdk_peerconnection_objc',
75 'type': 'static_library', 75 'type': 'static_library',
76 'includes': [ '../build/objc_common.gypi' ], 76 'includes': [ '../build/objc_common.gypi' ],
77 'dependencies': [ 77 'dependencies': [
78 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection', 78 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
79 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
79 'rtc_sdk_common_objc', 80 'rtc_sdk_common_objc',
80 ], 81 ],
81 'include_dirs': [ 82 'include_dirs': [
82 'objc/Framework/Classes', 83 'objc/Framework/Classes',
83 'objc/Framework/Headers', 84 'objc/Framework/Headers',
84 ], 85 ],
85 'direct_dependent_settings': { 86 'direct_dependent_settings': {
86 'include_dirs': [ 87 'include_dirs': [
87 'objc/Framework/Classes', 88 'objc/Framework/Classes',
88 'objc/Framework/Headers', 89 'objc/Framework/Headers',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 'objc/Framework/Headers/WebRTC/RTCSSLAdapter.h', 221 'objc/Framework/Headers/WebRTC/RTCSSLAdapter.h',
221 'objc/Framework/Headers/WebRTC/RTCTracing.h', 222 'objc/Framework/Headers/WebRTC/RTCTracing.h',
222 'objc/Framework/Headers/WebRTC/WebRTC.h', 223 'objc/Framework/Headers/WebRTC/WebRTC.h',
223 'objc/Framework/Modules/module.modulemap', 224 'objc/Framework/Modules/module.modulemap',
224 ], 225 ],
225 'mac_framework_headers': [ 226 'mac_framework_headers': [
226 '<!@(find -E objc/Framework/Headers -regex ".*(h)")', 227 '<!@(find -E objc/Framework/Headers -regex ".*(h)")',
227 ], 228 ],
228 'dependencies': [ 229 'dependencies': [
229 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 230 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
231 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
230 'rtc_sdk_peerconnection_objc', 232 'rtc_sdk_peerconnection_objc',
231 ], 233 ],
232 'xcode_settings': { 234 'xcode_settings': {
233 'CODE_SIGNING_REQUIRED': 'NO', 235 'CODE_SIGNING_REQUIRED': 'NO',
234 'CODE_SIGN_IDENTITY': '', 236 'CODE_SIGN_IDENTITY': '',
235 'DEFINES_MODULE': 'YES', 237 'DEFINES_MODULE': 'YES',
236 'INFOPLIST_FILE': 'objc/Framework/Info.plist', 238 'INFOPLIST_FILE': 'objc/Framework/Info.plist',
237 'LD_DYLIB_INSTALL_NAME': '@rpath/WebRTC.framework/WebRTC', 239 'LD_DYLIB_INSTALL_NAME': '@rpath/WebRTC.framework/WebRTC',
238 'MODULEMAP_FILE': '<(webrtc_root)/sdk/Framework/Modules/module.modul emap', 240 'MODULEMAP_FILE': '<(webrtc_root)/sdk/Framework/Modules/module.modul emap',
239 }, 241 },
(...skipping 22 matching lines...) Expand all
262 'mac_framework_headers!': [ 264 'mac_framework_headers!': [
263 'objc/Framework/Headers/WebRTC/RTCFileLogger.h', 265 'objc/Framework/Headers/WebRTC/RTCFileLogger.h',
264 ], 266 ],
265 }], 267 }],
266 ], # conditions 268 ], # conditions
267 }, # rtc_sdk_framework_objc 269 }, # rtc_sdk_framework_objc
268 ], # targets 270 ], # targets
269 }], # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7") 271 }], # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")
270 ], 272 ],
271 } 273 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698