| 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("//chrome/chrome_tests.gni") | 9 import("//chrome/chrome_tests.gni") |
| 10 import("//chrome/test/base/js2gtest.gni") | 10 import("//chrome/test/base/js2gtest.gni") |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 ] | 828 ] |
| 829 | 829 |
| 830 # TODO(GYP): Make NaCl work in other configs and update the irt | 830 # TODO(GYP): Make NaCl work in other configs and update the irt |
| 831 # dependency as appropriate. We should probably push this | 831 # dependency as appropriate. We should probably push this |
| 832 # dependency into ppapi/native_client so that clients don't need | 832 # dependency into ppapi/native_client so that clients don't need |
| 833 # to know all of the different toolchain options. | 833 # to know all of the different toolchain options. |
| 834 assert(current_cpu == "x64") | 834 assert(current_cpu == "x64") |
| 835 data_deps += [ | 835 data_deps += [ |
| 836 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 | 836 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 |
| 837 "//ppapi/native_client:irt", | 837 "//ppapi/native_client:irt", |
| 838 "//ppapi:ppapi_nacl_tests", | 838 "//ppapi:ppapi_nacl_tests_all", |
| 839 | 839 |
| 840 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 | 840 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 |
| 841 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac
kground_keepalive", # TODO(GYP) bug 512900 | 841 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac
kground_keepalive", # TODO(GYP) bug 512900 |
| 842 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med
ia_galleries", # TODO(GYP) bug 512900 | 842 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med
ia_galleries", # TODO(GYP) bug 512900 |
| 843 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac
kaged_app", # TODO(GYP) bug 512900 | 843 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac
kaged_app", # TODO(GYP) bug 512900 |
| 844 ] | 844 ] |
| 845 if (is_chromeos) { | 845 if (is_chromeos) { |
| 846 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] | 846 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro
wsertest.cc" ] |
| 847 deps += [ | 847 deps += [ |
| 848 "//chrome/browser/chromeos", | 848 "//chrome/browser/chromeos", |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2007 "//third_party/mojo/src/mojo/edk/system", | 2007 "//third_party/mojo/src/mojo/edk/system", |
| 2008 ] | 2008 ] |
| 2009 | 2009 |
| 2010 if (!is_android && use_ash) { | 2010 if (!is_android && use_ash) { |
| 2011 sources += rebase_path( | 2011 sources += rebase_path( |
| 2012 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2012 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
| 2013 ".", | 2013 ".", |
| 2014 "//chrome") | 2014 "//chrome") |
| 2015 } | 2015 } |
| 2016 } | 2016 } |
| OLD | NEW |