| OLD | NEW |
| 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 97 |
| 98 config("common_config") { | 98 config("common_config") { |
| 99 cflags = [] | 99 cflags = [] |
| 100 cflags_cc = [] | 100 cflags_cc = [] |
| 101 defines = [] | 101 defines = [] |
| 102 | 102 |
| 103 if (rtc_restrict_logging) { | 103 if (rtc_restrict_logging) { |
| 104 defines += [ "WEBRTC_RESTRICT_LOGGING" ] | 104 defines += [ "WEBRTC_RESTRICT_LOGGING" ] |
| 105 } | 105 } |
| 106 | 106 |
| 107 if (rtc_include_internal_audio_device) { |
| 108 defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ] |
| 109 } |
| 110 |
| 107 if (rtc_have_dbus_glib) { | 111 if (rtc_have_dbus_glib) { |
| 108 defines += [ "HAVE_DBUS_GLIB" ] | 112 defines += [ "HAVE_DBUS_GLIB" ] |
| 109 | 113 |
| 110 # TODO(kjellander): Investigate this, it seems like include <dbus/dbus.h> | 114 # TODO(kjellander): Investigate this, it seems like include <dbus/dbus.h> |
| 111 # is still not found even if the execution of | 115 # is still not found even if the execution of |
| 112 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include | 116 # build/config/linux/pkg-config.py dbus-glib-1 returns correct include |
| 113 # dirs on Linux. | 117 # dirs on Linux. |
| 114 all_dependent_configs = [ "dbus-glib" ] | 118 all_dependent_configs = [ "dbus-glib" ] |
| 115 } | 119 } |
| 116 | 120 |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 "base/bufferqueue_unittest.cc", | 421 "base/bufferqueue_unittest.cc", |
| 418 "base/bytebuffer_unittest.cc", | 422 "base/bytebuffer_unittest.cc", |
| 419 "base/byteorder_unittest.cc", | 423 "base/byteorder_unittest.cc", |
| 420 "base/callback_unittest.cc", | 424 "base/callback_unittest.cc", |
| 421 "base/copyonwritebuffer_unittest.cc", | 425 "base/copyonwritebuffer_unittest.cc", |
| 422 "base/crc32_unittest.cc", | 426 "base/crc32_unittest.cc", |
| 423 "base/criticalsection_unittest.cc", | 427 "base/criticalsection_unittest.cc", |
| 424 "base/event_tracer_unittest.cc", | 428 "base/event_tracer_unittest.cc", |
| 425 "base/event_unittest.cc", | 429 "base/event_unittest.cc", |
| 426 "base/exp_filter_unittest.cc", | 430 "base/exp_filter_unittest.cc", |
| 427 "base/fakeclock.cc", | |
| 428 "base/fakeclock.h", | |
| 429 "base/filerotatingstream_unittest.cc", | 431 "base/filerotatingstream_unittest.cc", |
| 430 "base/fileutils_unittest.cc", | 432 "base/fileutils_unittest.cc", |
| 431 "base/helpers_unittest.cc", | 433 "base/helpers_unittest.cc", |
| 432 "base/httpbase_unittest.cc", | 434 "base/httpbase_unittest.cc", |
| 433 "base/httpcommon_unittest.cc", | 435 "base/httpcommon_unittest.cc", |
| 434 "base/httpserver_unittest.cc", | 436 "base/httpserver_unittest.cc", |
| 435 "base/ipaddress_unittest.cc", | 437 "base/ipaddress_unittest.cc", |
| 436 "base/logging_unittest.cc", | 438 "base/logging_unittest.cc", |
| 437 "base/md5digest_unittest.cc", | 439 "base/md5digest_unittest.cc", |
| 438 "base/messagedigest_unittest.cc", | 440 "base/messagedigest_unittest.cc", |
| (...skipping 30 matching lines...) Expand all Loading... |
| 469 "base/stringutils_unittest.cc", | 471 "base/stringutils_unittest.cc", |
| 470 "base/swap_queue_unittest.cc", | 472 "base/swap_queue_unittest.cc", |
| 471 | 473 |
| 472 # TODO(ronghuawu): Reenable this test. | 474 # TODO(ronghuawu): Reenable this test. |
| 473 # "systeminfo_unittest.cc", | 475 # "systeminfo_unittest.cc", |
| 474 "base/task_queue_unittest.cc", | 476 "base/task_queue_unittest.cc", |
| 475 "base/task_unittest.cc", | 477 "base/task_unittest.cc", |
| 476 "base/testclient_unittest.cc", | 478 "base/testclient_unittest.cc", |
| 477 "base/thread_checker_unittest.cc", | 479 "base/thread_checker_unittest.cc", |
| 478 "base/thread_unittest.cc", | 480 "base/thread_unittest.cc", |
| 479 "base/timedelta.h", | |
| 480 "base/timeutils_unittest.cc", | 481 "base/timeutils_unittest.cc", |
| 481 "base/urlencode_unittest.cc", | 482 "base/urlencode_unittest.cc", |
| 482 "base/versionparsing_unittest.cc", | 483 "base/versionparsing_unittest.cc", |
| 483 | 484 |
| 484 # TODO(ronghuawu): Reenable this test. | 485 # TODO(ronghuawu): Reenable this test. |
| 485 # "windowpicker_unittest.cc", | 486 # "windowpicker_unittest.cc", |
| 486 "p2p/base/dtlstransportchannel_unittest.cc", | 487 "p2p/base/dtlstransportchannel_unittest.cc", |
| 487 "p2p/base/fakeportallocator.h", | 488 "p2p/base/fakeportallocator.h", |
| 488 "p2p/base/faketransportcontroller.h", | 489 "p2p/base/faketransportcontroller.h", |
| 489 "p2p/base/p2ptransportchannel_unittest.cc", | 490 "p2p/base/p2ptransportchannel_unittest.cc", |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 public_configs = [ ":common_inherited_config" ] | 561 public_configs = [ ":common_inherited_config" ] |
| 561 | 562 |
| 562 if (is_clang) { | 563 if (is_clang) { |
| 563 # Suppress warnings from the Chromium Clang plugin. | 564 # Suppress warnings from the Chromium Clang plugin. |
| 564 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 565 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 565 configs -= [ "//build/config/clang:find_bad_constructs" ] | 566 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 566 } | 567 } |
| 567 | 568 |
| 568 deps = [ | 569 deps = [ |
| 569 "base:rtc_base", | 570 "base:rtc_base", |
| 570 "base:rtc_base_test_utils", | 571 "base:rtc_base_tests_utils", |
| 571 "base:rtc_task_queue", | 572 "base:rtc_task_queue", |
| 572 "p2p:libstunprober", | 573 "p2p:libstunprober", |
| 573 "p2p:rtc_p2p", | 574 "p2p:rtc_p2p", |
| 574 "//testing/gmock", | 575 "//testing/gmock", |
| 575 "//testing/gtest", | 576 "//testing/gtest", |
| 576 ] | 577 ] |
| 577 | 578 |
| 578 if (is_android) { | 579 if (is_android) { |
| 579 deps += [ "//testing/android/native_test:native_test_support" ] | 580 deps += [ "//testing/android/native_test:native_test_support" ] |
| 580 } | 581 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 596 # TODO(tkchin): Cleanup this warning. | 597 # TODO(tkchin): Cleanup this warning. |
| 597 cflags = [ "-Wno-objc-property-no-attribute" ] | 598 cflags = [ "-Wno-objc-property-no-attribute" ] |
| 598 | 599 |
| 599 # |-ObjC| flag needed to make sure category method implementations | 600 # |-ObjC| flag needed to make sure category method implementations |
| 600 # are included: | 601 # are included: |
| 601 # https://developer.apple.com/library/mac/qa/qa1490/_index.html | 602 # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| 602 ldflags = [ "-ObjC" ] | 603 ldflags = [ "-ObjC" ] |
| 603 } | 604 } |
| 604 } | 605 } |
| 605 } | 606 } |
| OLD | NEW |