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

Side by Side Diff: webrtc/base/BUILD.gn

Issue 1349213003: Remove overridden basictypes.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git@master
Patch Set: Added missing include for Win. Created 5 years, 3 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 | « talk/media/base/yuvframegenerator.h ('k') | webrtc/base/base.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 import("//build/config/crypto.gni") 9 import("//build/config/crypto.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 "template_util.h", 151 "template_util.h",
152 "thread_annotations.h", 152 "thread_annotations.h",
153 "thread_checker.h", 153 "thread_checker.h",
154 "thread_checker_impl.cc", 154 "thread_checker_impl.cc",
155 "thread_checker_impl.h", 155 "thread_checker_impl.h",
156 "timeutils.cc", 156 "timeutils.cc",
157 "timeutils.h", 157 "timeutils.h",
158 "trace_event.h", 158 "trace_event.h",
159 ] 159 ]
160 160
161 if (build_with_chromium) { 161 if (!build_with_chromium) {
162 sources += [
163 "../overrides/webrtc/base/basictypes.h",
164 "../overrides/webrtc/base/constructormagic.h",
165 ]
166 } else {
167 sources += [ 162 sources += [
168 "basictypes.h", 163 "basictypes.h",
169 "constructormagic.h", 164 "constructormagic.h",
170 "logging.cc", 165 "logging.cc",
171 "logging.h", 166 "logging.h",
172 ] 167 ]
173 } 168 }
174 } 169 }
175 170
176 static_library("rtc_base") { 171 static_library("rtc_base") {
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 "linux.cc", 627 "linux.cc",
633 "linux.h", 628 "linux.h",
634 ] 629 ]
635 } 630 }
636 631
637 if (is_nacl) { 632 if (is_nacl) {
638 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 633 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
639 defines += [ "timezone=_timezone" ] 634 defines += [ "timezone=_timezone" ]
640 } 635 }
641 } 636 }
OLDNEW
« no previous file with comments | « talk/media/base/yuvframegenerator.h ('k') | webrtc/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698