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

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

Issue 1345313004: Update build files to use webrtc_overrides in Chromium instead of overrides. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 2 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/BUILD.gn ('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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 308
309 if (is_posix) { 309 if (is_posix) {
310 sources += [ 310 sources += [
311 "unixfilesystem.cc", 311 "unixfilesystem.cc",
312 "unixfilesystem.h", 312 "unixfilesystem.h",
313 ] 313 ]
314 } 314 }
315 315
316 if (build_with_chromium) { 316 if (build_with_chromium) {
317 sources += [ 317 sources += [
318 "../overrides/webrtc/base/logging.cc", 318 "../../webrtc_overrides/webrtc/base/logging.cc",
319 "../overrides/webrtc/base/logging.h", 319 "../../webrtc_overrides/webrtc/base/logging.h",
320 ] 320 ]
321 321
322 deps += [ "..:webrtc_common" ] 322 deps += [ "..:webrtc_common" ]
323 323
324 if (is_win) { 324 if (is_win) {
325 sources += [ "../overrides/webrtc/base/win32socketinit.cc" ] 325 sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
326 } 326 }
327 327
328 include_dirs = [ 328 include_dirs = [
329 "../overrides", 329 "../../webrtc_overrides",
330 "../../boringssl/src/include", 330 "../../boringssl/src/include",
331 ] 331 ]
332 332
333 public_configs += [ ":rtc_base_chromium_config" ] 333 public_configs += [ ":rtc_base_chromium_config" ]
334 } else { 334 } else {
335 sources += [ 335 sources += [
336 "bandwidthsmoother.cc", 336 "bandwidthsmoother.cc",
337 "bandwidthsmoother.h", 337 "bandwidthsmoother.h",
338 "bind.h", 338 "bind.h",
339 "bind.h.pump", 339 "bind.h.pump",
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 "linux.cc", 585 "linux.cc",
586 "linux.h", 586 "linux.h",
587 ] 587 ]
588 } 588 }
589 589
590 if (is_nacl) { 590 if (is_nacl) {
591 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 591 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
592 defines += [ "timezone=_timezone" ] 592 defines += [ "timezone=_timezone" ]
593 } 593 }
594 } 594 }
OLDNEW
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698