| 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 801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 } | 812 } |
| 813 if (!enable_nacl_browsertests) { | 813 if (!enable_nacl_browsertests) { |
| 814 sources -= [ "../browser/extensions/api/hotword_private/hotword_private_ap
itest.cc" ] | 814 sources -= [ "../browser/extensions/api/hotword_private/hotword_private_ap
itest.cc" ] |
| 815 } else if (enable_nacl) { | 815 } else if (enable_nacl) { |
| 816 sources += [ | 816 sources += [ |
| 817 "../browser/extensions/extension_nacl_browsertest.cc", | 817 "../browser/extensions/extension_nacl_browsertest.cc", |
| 818 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", | 818 "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc", |
| 819 ] | 819 ] |
| 820 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] | 820 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] |
| 821 | 821 |
| 822 data += [ |
| 823 # "$root_out_dir/nacl_helper", |
| 824 ] |
| 825 |
| 822 if (enable_nacl_untrusted) { | 826 if (enable_nacl_untrusted) { |
| 823 sources += [ | 827 sources += [ |
| 824 "nacl/nacl_browsertest.cc", | 828 "nacl/nacl_browsertest.cc", |
| 825 "nacl/nacl_browsertest_uma.cc", | 829 "nacl/nacl_browsertest_uma.cc", |
| 826 "nacl/nacl_browsertest_util.cc", | 830 "nacl/nacl_browsertest_util.cc", |
| 827 "nacl/nacl_browsertest_util.h", | 831 "nacl/nacl_browsertest_util.h", |
| 828 "nacl/pnacl_header_test.cc", | 832 "nacl/pnacl_header_test.cc", |
| 829 "nacl/pnacl_header_test.h", | 833 "nacl/pnacl_header_test.h", |
| 830 ] | 834 ] |
| 831 | 835 |
| 832 data_deps += [ | 836 data_deps += [ |
| 833 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 | 837 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 |
| 834 "//ppapi/native_client:irt", | 838 "//ppapi/native_client:irt", |
| 835 "//ppapi:ppapi_nacl_tests", | 839 "//ppapi:ppapi_nacl_tests_all", |
| 836 | 840 |
| 837 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 | 841 # "../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 | 842 # "../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 | 843 # "../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 | 844 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac
kaged_app", # TODO(GYP) bug 512900 |
| 841 ] | 845 ] |
| 842 if (is_chromeos) { | 846 if (is_chromeos) { |
| 843 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] | 847 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] |
| 844 deps += [ | 848 deps += [ |
| 845 "//chrome/browser/chromeos", | 849 "//chrome/browser/chromeos", |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2012 "//third_party/mojo/src/mojo/edk/system", | 2016 "//third_party/mojo/src/mojo/edk/system", |
| 2013 ] | 2017 ] |
| 2014 | 2018 |
| 2015 if (!is_android && use_ash) { | 2019 if (!is_android && use_ash) { |
| 2016 sources += rebase_path( | 2020 sources += rebase_path( |
| 2017 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2021 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2018 ".", | 2022 ".", |
| 2019 "//chrome") | 2023 "//chrome") |
| 2020 } | 2024 } |
| 2021 } | 2025 } |
| OLD | NEW |