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

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: Rename back test to libjingle_media_unittest Created 4 years, 11 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ], 55 ],
56 'all_dependent_settings': { 56 'all_dependent_settings': {
57 'xcode_settings': { 57 'xcode_settings': {
58 'OTHER_LDFLAGS': [ 58 'OTHER_LDFLAGS': [
59 '-framework CoreGraphics', 59 '-framework CoreGraphics',
60 '-framework GLKit', 60 '-framework GLKit',
61 '-framework OpenGLES', 61 '-framework OpenGLES',
62 '-framework QuartzCore', 62 '-framework QuartzCore',
63 ] 63 ]
64 } 64 }
65 } 65 },
66 # TODO(kjellander): Make the code compile without disabling these.
kjellander_webrtc 2016/01/20 21:12:17 Without this I get: ../../webrtc/api/objc/RTCSessi
67 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
68 'cflags': [
69 '-Wno-return-type',
70 ],
71 'xcode_settings': {
72 'WARNING_CFLAGS': [
73 '-Wno-return-type',
74 ],
75 },
66 }], 76 }],
67 ['OS=="mac"', { 77 ['OS=="mac"', {
68 'sources': [ 78 'sources': [
69 'objc/RTCNSGLVideoView.h', 79 'objc/RTCNSGLVideoView.h',
70 'objc/RTCNSGLVideoView.m', 80 'objc/RTCNSGLVideoView.m',
71 ], 81 ],
72 }], 82 }],
73 ], 83 ],
74 'xcode_settings': { 84 'xcode_settings': {
75 'CLANG_ENABLE_OBJC_ARC': 'YES', 85 'CLANG_ENABLE_OBJC_ARC': 'YES',
76 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 86 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
77 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch', 87 'GCC_PREFIX_HEADER': 'objc/WebRTC-Prefix.pch',
78 }, 88 },
79 } 89 }
80 ], 90 ],
81 }], # OS=="ios" 91 }], # OS=="ios"
82 ], 92 ],
83 } 93 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698