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

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

Issue 1935483002: Revert of New task queueing primitive for async tasks: TaskQueue. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@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 | « webrtc/base/BUILD.gn ('k') | webrtc/base/base_tests.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 # 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 'safe_conversions_impl.h', 128 'safe_conversions_impl.h',
129 'scoped_ptr.h', 129 'scoped_ptr.h',
130 'scoped_ref_ptr.h', 130 'scoped_ref_ptr.h',
131 'stringencode.cc', 131 'stringencode.cc',
132 'stringencode.h', 132 'stringencode.h',
133 'stringutils.cc', 133 'stringutils.cc',
134 'stringutils.h', 134 'stringutils.h',
135 'swap_queue.h', 135 'swap_queue.h',
136 'systeminfo.cc', 136 'systeminfo.cc',
137 'systeminfo.h', 137 'systeminfo.h',
138 'task_queue.h',
139 'task_queue_libevent.cc',
140 'task_queue_gcd.cc',
141 'task_queue_posix.cc',
142 'task_queue_posix.h',
143 'task_queue_win.cc',
144 'template_util.h', 138 'template_util.h',
145 'thread_annotations.h', 139 'thread_annotations.h',
146 'thread_checker.h', 140 'thread_checker.h',
147 'thread_checker_impl.cc', 141 'thread_checker_impl.cc',
148 'thread_checker_impl.h', 142 'thread_checker_impl.h',
149 'timeutils.cc', 143 'timeutils.cc',
150 'timeutils.h', 144 'timeutils.h',
151 'trace_event.h', 145 'trace_event.h',
152 ], 146 ],
153 'conditions': [ 147 'conditions': [
154 ['build_with_chromium==1', { 148 ['build_with_chromium==1', {
155 'dependencies': [ 149 'dependencies': [
156 '<(DEPTH)/base/base.gyp:base', 150 '<(DEPTH)/base/base.gyp:base',
157 ], 151 ],
158 'include_dirs': [ 152 'include_dirs': [
159 '../../webrtc_overrides', 153 '../../webrtc_overrides',
160 ], 154 ],
161 'sources': [ 155 'sources': [
162 '../../webrtc_overrides/webrtc/base/logging.cc', 156 '../../webrtc_overrides/webrtc/base/logging.cc',
163 '../../webrtc_overrides/webrtc/base/logging.h', 157 '../../webrtc_overrides/webrtc/base/logging.h',
164 ], 158 ],
165 }, { 159 }, {
166 'sources': [ 160 'sources': [
167 'logging.cc', 161 'logging.cc',
168 'logging.h', 162 'logging.h',
169 'logging_mac.mm', 163 'logging_mac.mm',
170 ], 164 ],
171 'conditions': [
172 ['OS!="win" and OS!="mac" and OS!="ios"', {
173 'dependencies': [
174 '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
175 ],
176 }],
177 ],
178 }],
179 ['OS=="mac" or OS=="ios" or OS=="win"', {
180 'sources!': [ 'task_queue_libevent.cc' ],
181 }],
182 ['OS=="linux" or OS=="android" or OS=="win"', {
183 'sources!': [ 'task_queue_gcd.cc' ],
184 }], 165 }],
185 ['OS=="mac" and build_with_chromium==0', { 166 ['OS=="mac" and build_with_chromium==0', {
186 'all_dependent_settings': { 167 'all_dependent_settings': {
187 'xcode_settings': { 168 'xcode_settings': {
188 'OTHER_LDFLAGS': [ 169 'OTHER_LDFLAGS': [
189 # needed for logging_mac.mm 170 # needed for logging_mac.mm
190 '-framework Foundation', 171 '-framework Foundation',
191 ], 172 ],
192 }, 173 },
193 }, 174 },
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 }, 657 },
677 { 658 {
678 'target_name': 'gtest_prod', 659 'target_name': 'gtest_prod',
679 'type': 'static_library', 660 'type': 'static_library',
680 'sources': [ 661 'sources': [
681 'gtest_prod_util.h', 662 'gtest_prod_util.h',
682 ], 663 ],
683 }, 664 },
684 ], 665 ],
685 } 666 }
OLDNEW
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698