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

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

Issue 1981573002: 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 'safe_conversions_impl.h', 77 'safe_conversions_impl.h',
78 'scoped_ptr.h', 78 'scoped_ptr.h',
79 'scoped_ref_ptr.h', 79 'scoped_ref_ptr.h',
80 'stringencode.cc', 80 'stringencode.cc',
81 'stringencode.h', 81 'stringencode.h',
82 'stringutils.cc', 82 'stringutils.cc',
83 'stringutils.h', 83 'stringutils.h',
84 'swap_queue.h', 84 'swap_queue.h',
85 'systeminfo.cc', 85 'systeminfo.cc',
86 'systeminfo.h', 86 'systeminfo.h',
87 'task_queue.h',
88 'task_queue_libevent.cc',
89 'task_queue_gcd.cc',
90 'task_queue_posix.cc',
91 'task_queue_posix.h',
92 'task_queue_win.cc',
93 'template_util.h', 87 'template_util.h',
94 'thread_annotations.h', 88 'thread_annotations.h',
95 'thread_checker.h', 89 'thread_checker.h',
96 'thread_checker_impl.cc', 90 'thread_checker_impl.cc',
97 'thread_checker_impl.h', 91 'thread_checker_impl.h',
98 'timeutils.cc', 92 'timeutils.cc',
99 'timeutils.h', 93 'timeutils.h',
100 'trace_event.h', 94 'trace_event.h',
101 ], 95 ],
102 'conditions': [ 96 'conditions': [
103 ['build_with_chromium==1', { 97 ['build_with_chromium==1', {
104 'dependencies': [ 98 'dependencies': [
105 '<(DEPTH)/base/base.gyp:base', 99 '<(DEPTH)/base/base.gyp:base',
106 ], 100 ],
107 'include_dirs': [ 101 'include_dirs': [
108 '../../webrtc_overrides', 102 '../../webrtc_overrides',
109 ], 103 ],
110 'sources': [ 104 'sources': [
111 '../../webrtc_overrides/webrtc/base/logging.cc', 105 '../../webrtc_overrides/webrtc/base/logging.cc',
112 '../../webrtc_overrides/webrtc/base/logging.h', 106 '../../webrtc_overrides/webrtc/base/logging.h',
113 ], 107 ],
114 }, { 108 }, {
115 'sources': [ 109 'sources': [
116 'logging.cc', 110 'logging.cc',
117 'logging.h', 111 'logging.h',
118 'logging_mac.mm', 112 'logging_mac.mm',
119 ], 113 ],
120 'conditions': [
121 ['build_libevent==1', {
122 'dependencies': [
123 '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
124 ],
125 }],
126 ],
127 }],
128 ['build_libevent!=1', {
129 'sources!': [ 'task_queue_libevent.cc' ],
130 }],
131 ['build_libevent==1 or OS=="linux" or OS=="android" or OS=="win"', {
132 'sources!': [ 'task_queue_gcd.cc' ],
133 }], 114 }],
134 ['OS=="mac" and build_with_chromium==0', { 115 ['OS=="mac" and build_with_chromium==0', {
135 'all_dependent_settings': { 116 'all_dependent_settings': {
136 'xcode_settings': { 117 'xcode_settings': {
137 'OTHER_LDFLAGS': [ 118 'OTHER_LDFLAGS': [
138 # needed for logging_mac.mm 119 # needed for logging_mac.mm
139 '-framework Foundation', 120 '-framework Foundation',
140 ], 121 ],
141 }, 122 },
142 }, 123 },
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 }, 607 },
627 { 608 {
628 'target_name': 'gtest_prod', 609 'target_name': 'gtest_prod',
629 'type': 'static_library', 610 'type': 'static_library',
630 'sources': [ 611 'sources': [
631 'gtest_prod_util.h', 612 'gtest_prod_util.h',
632 ], 613 ],
633 }, 614 },
634 ], 615 ],
635 } 616 }
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