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

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

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « talk/session/media/yuvscaler_unittest.cc ('k') | webrtc/api/objc/RTCVideoFrame+Private.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ], 84 ],
85 'all_dependent_settings': { 85 'all_dependent_settings': {
86 'xcode_settings': { 86 'xcode_settings': {
87 'OTHER_LDFLAGS': [ 87 'OTHER_LDFLAGS': [
88 '-framework CoreGraphics', 88 '-framework CoreGraphics',
89 '-framework GLKit', 89 '-framework GLKit',
90 '-framework OpenGLES', 90 '-framework OpenGLES',
91 '-framework QuartzCore', 91 '-framework QuartzCore',
92 ] 92 ]
93 } 93 }
94 } 94 },
95 # TODO(kjellander): Make the code compile without disabling these.
96 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
97 'cflags': [
98 '-Wno-return-type',
99 ],
100 'xcode_settings': {
101 'WARNING_CFLAGS': [
102 '-Wno-return-type',
103 ],
104 },
95 }], 105 }],
96 ['OS=="mac"', { 106 ['OS=="mac"', {
97 'sources': [ 107 'sources': [
98 'objc/RTCNSGLVideoView.h', 108 'objc/RTCNSGLVideoView.h',
99 'objc/RTCNSGLVideoView.m', 109 'objc/RTCNSGLVideoView.m',
100 ], 110 ],
101 }], 111 }],
102 ], 112 ],
103 'xcode_settings': { 113 'xcode_settings': {
104 'CLANG_ENABLE_OBJC_ARC': 'YES', 114 'CLANG_ENABLE_OBJC_ARC': 'YES',
105 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 115 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
106 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', 116 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
107 }, 117 },
108 } 118 }
109 ], 119 ],
110 }], # OS=="ios" 120 }], # OS=="ios"
111 ], 121 ],
112 } 122 }
OLDNEW
« no previous file with comments | « talk/session/media/yuvscaler_unittest.cc ('k') | webrtc/api/objc/RTCVideoFrame+Private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698