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

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

Issue 1980003002: Separate building and enabling libevent. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@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
« no previous file with comments | « no previous file | webrtc/build/common.gypi » ('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) 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 'sources': [ 114 'sources': [
115 'logging.cc', 115 'logging.cc',
116 'logging.h', 116 'logging.h',
117 'logging_mac.mm', 117 'logging_mac.mm',
118 ], 118 ],
119 }], 119 }],
120 ['build_libevent==1', { 120 ['build_libevent==1', {
121 'dependencies': [ 121 'dependencies': [
122 '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent', 122 '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
123 ], 123 ],
124 }, { 124 }],
125 ['enable_libevent!=1', {
kjellander_webrtc 2016/05/16 12:21:13 I suggest starting with enable_libevent==1 and t
phoglund 2016/05/16 13:18:01 Yeah, I might as well do it here so I'll do it.
125 'sources!': [ 'task_queue_libevent.cc' ], 126 'sources!': [ 'task_queue_libevent.cc' ],
126 'conditions': [ 127 'conditions': [
127 ['OS=="linux" or OS=="android"', { 128 ['OS=="linux" or OS=="android"', {
128 'sources!': [ 'task_queue_posix.cc' ], 129 'sources!': [ 'task_queue_posix.cc' ],
129 }], 130 }],
130 ], 131 ],
131 }], 132 }],
132 ['build_libevent==1 or OS=="linux" or OS=="android" or OS=="win"', { 133 ['enable_libevent==1 or OS=="linux" or OS=="android" or OS=="win"', {
kjellander_webrtc 2016/05/16 12:21:13 See previous comment. You can put this into a sub-
phoglund 2016/05/16 13:18:01 Done.
133 'sources!': [ 'task_queue_gcd.cc' ], 134 'sources!': [ 'task_queue_gcd.cc' ],
134 }], 135 }],
135 ['OS=="mac" and build_with_chromium==0', { 136 ['OS=="mac" and build_with_chromium==0', {
136 'all_dependent_settings': { 137 'all_dependent_settings': {
137 'xcode_settings': { 138 'xcode_settings': {
138 'OTHER_LDFLAGS': [ 139 'OTHER_LDFLAGS': [
139 # needed for logging_mac.mm 140 # needed for logging_mac.mm
140 '-framework Foundation', 141 '-framework Foundation',
141 ], 142 ],
142 }, 143 },
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 }, 622 },
622 { 623 {
623 'target_name': 'gtest_prod', 624 'target_name': 'gtest_prod',
624 'type': 'static_library', 625 'type': 'static_library',
625 'sources': [ 626 'sources': [
626 'gtest_prod_util.h', 627 'gtest_prod_util.h',
627 ], 628 ],
628 }, 629 },
629 ], 630 ],
630 } 631 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698