| 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 if (enable_nacl_untrusted) { | 822 if (enable_nacl_untrusted) { |
| 823 sources += [ | 823 sources += [ |
| 824 "nacl/nacl_browsertest.cc", | 824 "nacl/nacl_browsertest.cc", |
| 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 # TODO(GYP): Make NaCl work in other configs and update the irt | |
| 833 # dependency as appropriate. We should probably push this | |
| 834 # dependency into ppapi/native_client so that clients don't need | |
| 835 # to know all of the different toolchain options. | |
| 836 assert(current_cpu == "x64") | |
| 837 data_deps += [ | 832 data_deps += [ |
| 838 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 | 833 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 |
| 839 "//ppapi/native_client:irt", | 834 "//ppapi/native_client:irt", |
| 840 "//ppapi:ppapi_nacl_tests", | 835 "//ppapi:ppapi_nacl_tests", |
| 841 | 836 |
| 842 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 | 837 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 |
| 843 # "../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 |
| 844 # "../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 |
| 845 # "../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 |
| 846 ] | 841 ] |
| (...skipping 14 matching lines...) Expand all Loading... |
| 861 # browser process as needed by this test. See http://crbug.com/157312. | 856 # browser process as needed by this test. See http://crbug.com/157312. |
| 862 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] | 857 sources -= [ "../browser/nacl_host/test/gdb_debug_stub_browsertest.cc" ] |
| 863 deps += [ | 858 deps += [ |
| 864 #'chrome.gyp:chrome_nacl_win64', TODO(GYP) bug 512869 | 859 #'chrome.gyp:chrome_nacl_win64', TODO(GYP) bug 512869 |
| 865 ] | 860 ] |
| 866 configs -= [ "//build/config/win:default_incremental_linking" ] | 861 configs -= [ "//build/config/win:default_incremental_linking" ] |
| 867 configs += | 862 configs += |
| 868 [ "//build/config/win:default_large_module_incremental_linking" ] | 863 [ "//build/config/win:default_large_module_incremental_linking" ] |
| 869 } | 864 } |
| 870 if (is_linux) { | 865 if (is_linux) { |
| 871 deps += [ | 866 data_deps += [ |
| 872 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", | 867 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", |
| 873 "//components/nacl:nacl_helper", | 868 "//components/nacl:nacl_helper", |
| 874 | 869 |
| 875 # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi", # TODO(GYP) bug
512912. | 870 # "//components/nacl_nonsfi.gyp:nacl_helper_nonsfi", # TODO(GYP) bug
512912. |
| 876 ] | 871 ] |
| 877 } | 872 } |
| 878 } | 873 } |
| 879 if (debug_devtools) { | 874 if (debug_devtools) { |
| 880 defines += [ "DEBUG_DEVTOOLS=1" ] | 875 defines += [ "DEBUG_DEVTOOLS=1" ] |
| 881 } | 876 } |
| (...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2017 "//third_party/mojo/src/mojo/edk/system", | 2012 "//third_party/mojo/src/mojo/edk/system", |
| 2018 ] | 2013 ] |
| 2019 | 2014 |
| 2020 if (!is_android && use_ash) { | 2015 if (!is_android && use_ash) { |
| 2021 sources += rebase_path( | 2016 sources += rebase_path( |
| 2022 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2017 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2023 ".", | 2018 ".", |
| 2024 "//chrome") | 2019 "//chrome") |
| 2025 } | 2020 } |
| 2026 } | 2021 } |
| OLD | NEW |