| 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 import("//build/config/crypto.gni") | 9 import("//build/config/crypto.gni") |
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 | 723 |
| 724 if (!build_with_chromium && is_clang) { | 724 if (!build_with_chromium && is_clang) { |
| 725 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 725 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 726 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 726 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 727 } | 727 } |
| 728 } | 728 } |
| 729 | 729 |
| 730 if (rtc_include_tests) { | 730 if (rtc_include_tests) { |
| 731 rtc_source_set("rtc_base_tests_main") { | 731 rtc_source_set("rtc_base_tests_main") { |
| 732 testonly = true | 732 testonly = true |
| 733 sources = [ | 733 sources = [] |
| 734 "unittest_main.cc", | 734 if (!is_ios) { |
| 735 ] | 735 sources += [ "unittest_main.cc" ] |
| 736 } |
| 736 public_configs = [ ":rtc_base_tests_utils_exported_config" ] | 737 public_configs = [ ":rtc_base_tests_utils_exported_config" ] |
| 737 deps = [ | 738 deps = [ |
| 738 ":rtc_base", | 739 ":rtc_base", |
| 739 ":rtc_base_approved", | 740 ":rtc_base_approved", |
| 740 ":rtc_base_tests_utils", | 741 ":rtc_base_tests_utils", |
| 741 "../test:field_trial", | 742 "../test:field_trial", |
| 742 "../test:test_support", | 743 "../test:test_support", |
| 743 ] | 744 ] |
| 745 |
| 746 # TODO(oprypin): Bug 7758: integrate the iOS unittest support into WebRTC's |
| 747 # unittest_main instead of replacing it with Chromium's main function. |
| 748 if (is_ios) { |
| 749 deps += [ "//base/test:run_all_unittests" ] |
| 750 } |
| 744 public_deps = [ | 751 public_deps = [ |
| 745 "//testing/gmock", | 752 "//testing/gmock", |
| 746 "//testing/gtest", | 753 "//testing/gtest", |
| 747 ] | 754 ] |
| 748 | 755 |
| 749 if (!build_with_chromium && is_clang) { | 756 if (!build_with_chromium && is_clang) { |
| 750 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 757 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 751 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 758 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 752 } | 759 } |
| 753 } | 760 } |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 if (is_android) { | 986 if (is_android) { |
| 980 android_library("base_java") { | 987 android_library("base_java") { |
| 981 java_files = [ | 988 java_files = [ |
| 982 "java/src/org/webrtc/ContextUtils.java", | 989 "java/src/org/webrtc/ContextUtils.java", |
| 983 "java/src/org/webrtc/Logging.java", | 990 "java/src/org/webrtc/Logging.java", |
| 984 "java/src/org/webrtc/Size.java", | 991 "java/src/org/webrtc/Size.java", |
| 985 "java/src/org/webrtc/ThreadUtils.java", | 992 "java/src/org/webrtc/ThreadUtils.java", |
| 986 ] | 993 ] |
| 987 } | 994 } |
| 988 } | 995 } |
| OLD | NEW |