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