Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
| (...skipping 1719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1730 "//ash/strings", | 1730 "//ash/strings", |
| 1731 ] | 1731 ] |
| 1732 | 1732 |
| 1733 # We eventually want to compile both in Win Aura builds, see | 1733 # We eventually want to compile both in Win Aura builds, see |
| 1734 # http://crbug.com/155545. | 1734 # http://crbug.com/155545. |
| 1735 if (!is_win) { | 1735 if (!is_win) { |
| 1736 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] | 1736 sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ] |
| 1737 } | 1737 } |
| 1738 } | 1738 } |
| 1739 if (use_aura) { | 1739 if (use_aura) { |
| 1740 sources += [ "//ui/views/controls/webview/webview_unittest.cc" ] | |
|
tapted
2016/03/01 03:02:46
(the removed line: no longer needed since this fil
| |
| 1741 deps += [ | 1740 deps += [ |
| 1742 "//ui/aura:test_support", | 1741 "//ui/aura:test_support", |
| 1743 "//ui/views:test_support", | 1742 "//ui/views:test_support", |
| 1744 "//ui/wm", | 1743 "//ui/wm", |
| 1745 ] | 1744 ] |
| 1746 } | 1745 } |
| 1747 if (!is_chromeos && is_linux) { | 1746 if (!is_chromeos && is_linux) { |
| 1748 sources += rebase_path( | 1747 sources += rebase_path( |
| 1749 chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_source s, | 1748 chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_source s, |
| 1750 ".", | 1749 ".", |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2046 ".", | 2045 ".", |
| 2047 "//chrome") | 2046 "//chrome") |
| 2048 } | 2047 } |
| 2049 if (toolkit_views) { | 2048 if (toolkit_views) { |
| 2050 deps += [ | 2049 deps += [ |
| 2051 "//components/web_modal:test_support", | 2050 "//components/web_modal:test_support", |
| 2052 "//ui/views", | 2051 "//ui/views", |
| 2053 "//ui/views:test_support", | 2052 "//ui/views:test_support", |
| 2054 ] | 2053 ] |
| 2055 sources += rebase_path( | 2054 sources += rebase_path( |
| 2056 chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources, | 2055 chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources, |
|
tapted
2016/03/01 03:02:46
(which is down here)
| |
| 2057 ".", | 2056 ".", |
| 2058 "//chrome") | 2057 "//chrome") |
| 2059 if (!is_chromeos && (!is_mac || mac_views_browser)) { | 2058 if (!is_chromeos && (!is_mac || mac_views_browser)) { |
| 2060 sources += rebase_path( | 2059 sources += rebase_path( |
| 2061 chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_chromeos _sources, | 2060 chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_chromeos _sources, |
| 2062 ".", | 2061 ".", |
| 2063 "//chrome") | 2062 "//chrome") |
| 2064 } | 2063 } |
| 2065 if (!is_mac) { | 2064 if (!is_mac) { |
| 2066 sources += rebase_path( | 2065 sources += rebase_path( |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2232 if (is_android) { | 2231 if (is_android) { |
| 2233 android_library("unit_tests_java") { | 2232 android_library("unit_tests_java") { |
| 2234 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2233 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2235 deps = [ | 2234 deps = [ |
| 2236 "//base:base_java", | 2235 "//base:base_java", |
| 2237 "//chrome/android:chrome_java", | 2236 "//chrome/android:chrome_java", |
| 2238 "//content/public/android:content_java", | 2237 "//content/public/android:content_java", |
| 2239 ] | 2238 ] |
| 2240 } | 2239 } |
| 2241 } | 2240 } |
| OLD | NEW |