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/crypto.gni") | 6 import("//build/config/crypto.gni") |
7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
9 import("//build/module_args/v8.gni") | 9 import("//build/module_args/v8.gni") |
10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1270 ] | 1270 ] |
1271 } | 1271 } |
1272 | 1272 |
1273 if (is_android) { | 1273 if (is_android) { |
1274 deps -= [ "//third_party/libaddressinput" ] | 1274 deps -= [ "//third_party/libaddressinput" ] |
1275 | 1275 |
1276 # Some android targets still depend on --gc-sections to link. | 1276 # Some android targets still depend on --gc-sections to link. |
1277 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). | 1277 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). |
1278 ldflags = [ "-Wl,--gc-sections" ] | 1278 ldflags = [ "-Wl,--gc-sections" ] |
1279 deps += [ "//testing/android/native_test:native_test_native_code" ] | 1279 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 1280 isolate_file = "../unit_tests.isolate" |
1280 } else { | 1281 } else { |
1281 sources += | 1282 sources += |
1282 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, | 1283 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, |
1283 ".", | 1284 ".", |
1284 "//chrome") | 1285 "//chrome") |
1285 } | 1286 } |
1286 | 1287 |
1287 if (is_ios || is_chromeos) { | 1288 if (is_ios || is_chromeos) { |
1288 sources -= | 1289 sources -= |
1289 [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ] | 1290 [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ] |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1760 } | 1761 } |
1761 | 1762 |
1762 if (cld_version == 0 || cld_version == 2) { | 1763 if (cld_version == 0 || cld_version == 2) { |
1763 # Use whatever CLD2 data access mode that the | 1764 # Use whatever CLD2 data access mode that the |
1764 # application embedder is using. | 1765 # application embedder is using. |
1765 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1766 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
1766 } | 1767 } |
1767 } | 1768 } |
1768 } | 1769 } |
1769 } | 1770 } |
OLD | NEW |