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/BUILD.gn

Issue 2553683002: Clean up redundant include of ../webrtc_overrides (Closed)
Patch Set: Created 4 years 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 | no next file » | 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 sources += [ "file_win.cc" ] 193 sources += [ "file_win.cc" ]
194 } 194 }
195 195
196 if (build_with_chromium) { 196 if (build_with_chromium) {
197 # Dependency on chromium's logging (in //base). 197 # Dependency on chromium's logging (in //base).
198 deps += [ "//base:base" ] 198 deps += [ "//base:base" ]
199 sources += [ 199 sources += [
200 "../../webrtc_overrides/webrtc/base/logging.cc", 200 "../../webrtc_overrides/webrtc/base/logging.cc",
201 "../../webrtc_overrides/webrtc/base/logging.h", 201 "../../webrtc_overrides/webrtc/base/logging.h",
202 ] 202 ]
203 include_dirs = [ "../../webrtc_overrides" ]
204 } else { 203 } else {
205 sources += [ 204 sources += [
206 "logging.cc", 205 "logging.cc",
207 "logging.h", 206 "logging.h",
208 "logging_mac.mm", 207 "logging_mac.mm",
209 ] 208 ]
210 } 209 }
211 if (is_component_build && is_win) { 210 if (is_component_build && is_win) {
212 # Copy the VS runtime DLLs into the isolate so that they don't have to be 211 # Copy the VS runtime DLLs into the isolate so that they don't have to be
213 # preinstalled on the target machine. The debug runtimes have a "d" at 212 # preinstalled on the target machine. The debug runtimes have a "d" at
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 "sequenced_task_checker_impl.h", 296 "sequenced_task_checker_impl.h",
298 "weak_ptr.cc", 297 "weak_ptr.cc",
299 "weak_ptr.h", 298 "weak_ptr.h",
300 ] 299 ]
301 300
302 if (build_with_chromium) { 301 if (build_with_chromium) {
303 sources += [ 302 sources += [
304 "../../webrtc_overrides/webrtc/base/task_queue.cc", 303 "../../webrtc_overrides/webrtc/base/task_queue.cc",
305 "../../webrtc_overrides/webrtc/base/task_queue.h", 304 "../../webrtc_overrides/webrtc/base/task_queue.h",
306 ] 305 ]
307 include_dirs = [ "../../webrtc_overrides" ]
308 } else { 306 } else {
309 sources += [ 307 sources += [
310 "task_queue.h", 308 "task_queue.h",
311 "task_queue_posix.h", 309 "task_queue_posix.h",
312 ] 310 ]
313 if (rtc_build_libevent) { 311 if (rtc_build_libevent) {
314 deps = [ 312 deps = [
315 "//base/third_party/libevent", 313 "//base/third_party/libevent",
316 ] 314 ]
317 } 315 }
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 suppressed_configs += [ "//build/config/compiler:chromium_code" ] 516 suppressed_configs += [ "//build/config/compiler:chromium_code" ]
519 configs += [ "//build/config/compiler:no_chromium_code" ] 517 configs += [ "//build/config/compiler:no_chromium_code" ]
520 if (!is_win) { 518 if (!is_win) {
521 cflags += [ "-Wno-uninitialized" ] 519 cflags += [ "-Wno-uninitialized" ]
522 } 520 }
523 521
524 if (build_with_chromium) { 522 if (build_with_chromium) {
525 if (is_win) { 523 if (is_win) {
526 sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ] 524 sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
527 } 525 }
528 526 include_dirs = [ "../../boringssl/src/include" ]
529 include_dirs = [
530 "../../webrtc_overrides",
531 "../../boringssl/src/include",
532 ]
533
534 public_configs += [ ":rtc_base_chromium_config" ] 527 public_configs += [ ":rtc_base_chromium_config" ]
535 } else { 528 } else {
536 configs += [ ":rtc_base_warnings_config" ] 529 configs += [ ":rtc_base_warnings_config" ]
537 sources += [ 530 sources += [
538 "callback.h", 531 "callback.h",
539 "fileutils_mock.h", 532 "fileutils_mock.h",
540 "httpserver.cc", 533 "httpserver.cc",
541 "httpserver.h", 534 "httpserver.h",
542 "json.cc", 535 "json.cc",
543 "json.h", 536 "json.h",
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 766
774 deps = [ 767 deps = [
775 "//base:base_java", 768 "//base:base_java",
776 ] 769 ]
777 770
778 data = [ 771 data = [
779 "//webrtc/build/android/test_runner.py", 772 "//webrtc/build/android/test_runner.py",
780 ] 773 ]
781 } 774 }
782 } 775 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698