| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 # Use only the _chromeos version on ChromeOS. | 379 # Use only the _chromeos version on ChromeOS. |
| 380 "base/view_event_test_platform_part_ash.cc", | 380 "base/view_event_test_platform_part_ash.cc", |
| 381 ] | 381 ] |
| 382 | 382 |
| 383 deps += [ | 383 deps += [ |
| 384 "//ash/resources", | 384 "//ash/resources", |
| 385 "//chromeos", | 385 "//chromeos", |
| 386 ] | 386 ] |
| 387 | 387 |
| 388 if (enable_nacl) { | 388 if (enable_nacl) { |
| 389 deps += [ | 389 data_deps += [ |
| 390 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", | 390 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", |
| 391 "//components/nacl:nacl_helper", | 391 "//components/nacl:nacl_helper", |
| 392 | 392 |
| 393 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) | 393 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) |
| 394 ] | 394 ] |
| 395 } | 395 } |
| 396 | 396 |
| 397 if (is_chrome_branded) { | 397 if (is_chrome_branded) { |
| 398 sources -= [ | 398 sources -= [ |
| 399 # These tests are failing on official cros bots. crbug.com/431450. | 399 # These tests are failing on official cros bots. crbug.com/431450. |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 "nacl/nacl_browsertest_uma.cc", | 825 "nacl/nacl_browsertest_uma.cc", |
| 826 "nacl/nacl_browsertest_util.cc", | 826 "nacl/nacl_browsertest_util.cc", |
| 827 "nacl/nacl_browsertest_util.h", | 827 "nacl/nacl_browsertest_util.h", |
| 828 "nacl/pnacl_header_test.cc", | 828 "nacl/pnacl_header_test.cc", |
| 829 "nacl/pnacl_header_test.h", | 829 "nacl/pnacl_header_test.h", |
| 830 ] | 830 ] |
| 831 | 831 |
| 832 data_deps += [ | 832 data_deps += [ |
| 833 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 | 833 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 |
| 834 "//ppapi/native_client:irt", | 834 "//ppapi/native_client:irt", |
| 835 "//ppapi:ppapi_nacl_tests", | 835 "//ppapi:ppapi_nacl_tests_all", |
| 836 | 836 |
| 837 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 | 837 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 |
| 838 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac
kground_keepalive", # TODO(GYP) bug 512900 | 838 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac
kground_keepalive", # TODO(GYP) bug 512900 |
| 839 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med
ia_galleries", # TODO(GYP) bug 512900 | 839 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med
ia_galleries", # TODO(GYP) bug 512900 |
| 840 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac
kaged_app", # TODO(GYP) bug 512900 | 840 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac
kaged_app", # TODO(GYP) bug 512900 |
| 841 ] | 841 ] |
| 842 if (is_chromeos) { | 842 if (is_chromeos) { |
| 843 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] | 843 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] |
| 844 deps += [ | 844 deps += [ |
| 845 "//chrome/browser/chromeos", | 845 "//chrome/browser/chromeos", |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2012 "//third_party/mojo/src/mojo/edk/system", | 2012 "//third_party/mojo/src/mojo/edk/system", |
| 2013 ] | 2013 ] |
| 2014 | 2014 |
| 2015 if (!is_android && use_ash) { | 2015 if (!is_android && use_ash) { |
| 2016 sources += rebase_path( | 2016 sources += rebase_path( |
| 2017 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2017 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2018 ".", | 2018 ".", |
| 2019 "//chrome") | 2019 "//chrome") |
| 2020 } | 2020 } |
| 2021 } | 2021 } |
| OLD | NEW |