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

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

Issue 1898283002: Fix compilation of rtc_base_objc on iOS when building as part of Chromium. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update webrtc/base/base.gyp Created 4 years, 8 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 | « webrtc/base/BUILD.gn ('k') | no next file » | 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) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 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 20 matching lines...) Expand all
31 'dependencies': [ 31 'dependencies': [
32 'rtc_base', 32 'rtc_base',
33 ], 33 ],
34 'sources': [ 34 'sources': [
35 'objc/NSString+StdString.h', 35 'objc/NSString+StdString.h',
36 'objc/NSString+StdString.mm', 36 'objc/NSString+StdString.mm',
37 'objc/RTCDispatcher.h', 37 'objc/RTCDispatcher.h',
38 'objc/RTCDispatcher.m', 38 'objc/RTCDispatcher.m',
39 'objc/RTCFieldTrials.h', 39 'objc/RTCFieldTrials.h',
40 'objc/RTCFieldTrials.mm', 40 'objc/RTCFieldTrials.mm',
41 'objc/RTCFileLogger.h',
42 'objc/RTCFileLogger.mm',
43 'objc/RTCLogging.h', 41 'objc/RTCLogging.h',
44 'objc/RTCLogging.mm', 42 'objc/RTCLogging.mm',
45 'objc/RTCMacros.h', 43 'objc/RTCMacros.h',
46 'objc/RTCSSLAdapter.h', 44 'objc/RTCSSLAdapter.h',
47 'objc/RTCSSLAdapter.mm', 45 'objc/RTCSSLAdapter.mm',
48 'objc/RTCTracing.h', 46 'objc/RTCTracing.h',
49 'objc/RTCTracing.mm', 47 'objc/RTCTracing.mm',
50 ], 48 ],
51 'conditions': [ 49 'conditions': [
52 ['OS=="ios"', { 50 ['OS=="ios"', {
53 'sources': [ 51 'sources': [
54 'objc/RTCCameraPreviewView.h', 52 'objc/RTCCameraPreviewView.h',
55 'objc/RTCCameraPreviewView.m', 53 'objc/RTCCameraPreviewView.m',
56 'objc/RTCUIApplication.h', 54 'objc/RTCUIApplication.h',
57 'objc/RTCUIApplication.mm', 55 'objc/RTCUIApplication.mm',
58 ], 56 ],
59 'all_dependent_settings': { 57 'all_dependent_settings': {
60 'xcode_settings': { 58 'xcode_settings': {
61 'OTHER_LDFLAGS': [ 59 'OTHER_LDFLAGS': [
62 '-framework AVFoundation', 60 '-framework AVFoundation',
63 ], 61 ],
64 }, 62 },
65 }, 63 },
66 }], 64 }],
65 ['build_with_chromium==0', {
66 'sources': [
67 'objc/RTCFileLogger.h',
68 'objc/RTCFileLogger.mm',
69 ],
70 }],
67 ], 71 ],
68 } 72 }
69 ], 73 ],
70 }], # OS=="ios" 74 }], # OS=="ios"
71 ], 75 ],
72 'targets': [ 76 'targets': [
73 { 77 {
74 # The subset of rtc_base approved for use outside of libjingle. 78 # The subset of rtc_base approved for use outside of libjingle.
75 'target_name': 'rtc_base_approved', 79 'target_name': 'rtc_base_approved',
76 'type': 'static_library', 80 'type': 'static_library',
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 }, 646 },
643 { 647 {
644 'target_name': 'gtest_prod', 648 'target_name': 'gtest_prod',
645 'type': 'static_library', 649 'type': 'static_library',
646 'sources': [ 650 'sources': [
647 'gtest_prod_util.h', 651 'gtest_prod_util.h',
648 ], 652 ],
649 }, 653 },
650 ], 654 ],
651 } 655 }
OLDNEW
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698