| 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 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 ".", | 1059 ".", |
| 1060 "//chrome") | 1060 "//chrome") |
| 1061 deps += [ "//ui/views" ] | 1061 deps += [ "//ui/views" ] |
| 1062 if (!is_mac) { | 1062 if (!is_mac) { |
| 1063 sources += rebase_path( | 1063 sources += rebase_path( |
| 1064 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour
ces, | 1064 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour
ces, |
| 1065 ".", | 1065 ".", |
| 1066 "//chrome") | 1066 "//chrome") |
| 1067 } | 1067 } |
| 1068 } | 1068 } |
| 1069 |
| 1070 if (is_linux && !is_component_build) { |
| 1071 # Set rpath to find the CDM adapter even in a non-component build. |
| 1072 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] |
| 1073 } |
| 1074 |
| 1069 if (is_chromeos) { | 1075 if (is_chromeos) { |
| 1070 sources += rebase_path( | 1076 sources += rebase_path( |
| 1071 chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources, | 1077 chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources, |
| 1072 ".", | 1078 ".", |
| 1073 "//chrome") | 1079 "//chrome") |
| 1074 sources -= [ | 1080 sources -= [ |
| 1075 "../../apps/load_and_launch_browsertest.cc", | 1081 "../../apps/load_and_launch_browsertest.cc", |
| 1076 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, | 1082 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, |
| 1077 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert
est.cc", | 1083 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert
est.cc", |
| 1078 | 1084 |
| (...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2258 if (is_android) { | 2264 if (is_android) { |
| 2259 android_library("unit_tests_java") { | 2265 android_library("unit_tests_java") { |
| 2260 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" | 2266 DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src" |
| 2261 deps = [ | 2267 deps = [ |
| 2262 "//base:base_java", | 2268 "//base:base_java", |
| 2263 "//chrome/android:chrome_java", | 2269 "//chrome/android:chrome_java", |
| 2264 "//content/public/android:content_java", | 2270 "//content/public/android:content_java", |
| 2265 ] | 2271 ] |
| 2266 } | 2272 } |
| 2267 } | 2273 } |
| OLD | NEW |