| 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 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 ] | 1271 ] |
| 1272 } | 1272 } |
| 1273 | 1273 |
| 1274 if (is_android) { | 1274 if (is_android) { |
| 1275 deps -= [ "//third_party/libaddressinput" ] | 1275 deps -= [ "//third_party/libaddressinput" ] |
| 1276 | 1276 |
| 1277 # Some android targets still depend on --gc-sections to link. | 1277 # Some android targets still depend on --gc-sections to link. |
| 1278 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). | 1278 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). |
| 1279 ldflags = [ "-Wl,--gc-sections" ] | 1279 ldflags = [ "-Wl,--gc-sections" ] |
| 1280 deps += [ "//testing/android/native_test:native_test_native_code" ] | 1280 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 1281 isolate_file = "../unit_tests.isolate" |
| 1281 } else { | 1282 } else { |
| 1282 sources += | 1283 sources += |
| 1283 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, | 1284 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, |
| 1284 ".", | 1285 ".", |
| 1285 "//chrome") | 1286 "//chrome") |
| 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" ] |
| 1290 } | 1291 } |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1766 } | 1767 } |
| 1767 | 1768 |
| 1768 if (cld_version == 0 || cld_version == 2) { | 1769 if (cld_version == 0 || cld_version == 2) { |
| 1769 # Use whatever CLD2 data access mode that the | 1770 # Use whatever CLD2 data access mode that the |
| 1770 # application embedder is using. | 1771 # application embedder is using. |
| 1771 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 1772 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 1772 } | 1773 } |
| 1773 } | 1774 } |
| 1774 } | 1775 } |
| 1775 } | 1776 } |
| OLD | NEW |