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

Side by Side Diff: talk/app/webrtc/legacy_objc_api_tests.gyp

Issue 2026223002: Remove metrics_default from rtc_media dependencies. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add Android and Mac/iOS specific dependencies Created 4 years, 6 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
« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 21 matching lines...) Expand all
32 # opposed to _compile_ cleanly, which the library under test 32 # opposed to _compile_ cleanly, which the library under test
33 # does just fine on 10.6 too). 33 # does just fine on 10.6 too).
34 'targets': [ 34 'targets': [
35 { 35 {
36 'target_name': 'libjingle_peerconnection_objc_test', 36 'target_name': 'libjingle_peerconnection_objc_test',
37 'type': 'executable', 37 'type': 'executable',
38 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ], 38 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ],
39 'dependencies': [ 39 'dependencies': [
40 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 40 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
41 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 41 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
42 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
42 'legacy_objc_api.gyp:libjingle_peerconnection_objc', 43 'legacy_objc_api.gyp:libjingle_peerconnection_objc',
43 ], 44 ],
44 'sources': [ 45 'sources': [
45 'objctests/RTCPeerConnectionSyncObserver.h', 46 'objctests/RTCPeerConnectionSyncObserver.h',
46 'objctests/RTCPeerConnectionSyncObserver.m', 47 'objctests/RTCPeerConnectionSyncObserver.m',
47 'objctests/RTCPeerConnectionTest.mm', 48 'objctests/RTCPeerConnectionTest.mm',
48 'objctests/RTCSessionDescriptionSyncObserver.h', 49 'objctests/RTCSessionDescriptionSyncObserver.h',
49 'objctests/RTCSessionDescriptionSyncObserver.m', 50 'objctests/RTCSessionDescriptionSyncObserver.m',
50 # TODO(fischman): figure out if this works for ios or if it 51 # TODO(fischman): figure out if this works for ios or if it
51 # needs a GUI driver. 52 # needs a GUI driver.
(...skipping 12 matching lines...) Expand all
64 }], 65 }],
65 ], 66 ],
66 }, # target libjingle_peerconnection_objc_test 67 }, # target libjingle_peerconnection_objc_test
67 { 68 {
68 'target_name': 'apprtc_signaling_gunit_test', 69 'target_name': 'apprtc_signaling_gunit_test',
69 'type': 'executable', 70 'type': 'executable',
70 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ], 71 'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ],
71 'dependencies': [ 72 'dependencies': [
72 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 73 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
73 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 74 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
75 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
74 '<(webrtc_root)/webrtc_examples.gyp:apprtc_signaling', 76 '<(webrtc_root)/webrtc_examples.gyp:apprtc_signaling',
75 '<(DEPTH)/third_party/ocmock/ocmock.gyp:ocmock', 77 '<(DEPTH)/third_party/ocmock/ocmock.gyp:ocmock',
76 ], 78 ],
77 'sources': [ 79 'sources': [
78 'objctests/mac/main.mm', 80 'objctests/mac/main.mm',
79 '<(webrtc_root)/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm', 81 '<(webrtc_root)/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm',
80 ], 82 ],
81 'conditions': [ 83 'conditions': [
82 ['OS=="mac"', { 84 ['OS=="mac"', {
83 'xcode_settings': { 85 'xcode_settings': {
84 'MACOSX_DEPLOYMENT_TARGET' : '10.8', 86 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
85 }, 87 },
86 }], 88 }],
87 ], 89 ],
88 }, # target apprtc_signaling_gunit_test 90 }, # target apprtc_signaling_gunit_test
89 ], 91 ],
90 }], 92 }],
91 ], 93 ],
92 } 94 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698