Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Side by Side Diff: chrome/test/BUILD.gn

Issue 1312813003: add nacl_toolchain to //build and flip to using it in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@build_changes
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 "nacl/pnacl_header_test.h", 775 "nacl/pnacl_header_test.h",
776 ] 776 ]
777 777
778 # TODO(GYP): Make NaCl work in other configs and update the irt 778 # TODO(GYP): Make NaCl work in other configs and update the irt
779 # dependency as appropriate. We should probably push this 779 # dependency as appropriate. We should probably push this
780 # dependency into ppapi/native_client so that clients don't need 780 # dependency into ppapi/native_client so that clients don't need
781 # to know all of the different toolchain options. 781 # to know all of the different toolchain options.
782 assert(current_cpu == "x64") 782 assert(current_cpu == "x64")
783 data_deps += [ 783 data_deps += [
784 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902 784 # "test/data/nacl:shared_test_files", # TODO(GYP) bug 512902
785 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:i rt_x64)", 785 "//ppapi/native_client:nacl_irt(//build/toolchain/nacl:irt_x64)",
786 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901 786 # "../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests", # TODO(GYP) bug 512901
787 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac kground_keepalive", # TODO(GYP) bug 512900 787 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_bac kground_keepalive", # TODO(GYP) bug 512900
788 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med ia_galleries", # TODO(GYP) bug 512900 788 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_med ia_galleries", # TODO(GYP) bug 512900
789 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac kaged_app", # TODO(GYP) bug 512900 789 # "../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_pac kaged_app", # TODO(GYP) bug 512900
790 ] 790 ]
791 if (is_chromeos) { 791 if (is_chromeos) {
792 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro wsertest.cc" ] 792 sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_bro wsertest.cc" ]
793 deps += [ 793 deps += [
794 "//chrome/browser/chromeos", 794 "//chrome/browser/chromeos",
795 #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data', TO DO(GYP) bug 512906 795 #'../third_party/liblouis/liblouis_nacl.gyp:liblouis_test_data', TO DO(GYP) bug 512906
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 "//third_party/mojo/src/mojo/edk/system", 1962 "//third_party/mojo/src/mojo/edk/system",
1963 ] 1963 ]
1964 1964
1965 if (!is_android && use_ash) { 1965 if (!is_android && use_ash) {
1966 sources += rebase_path( 1966 sources += rebase_path(
1967 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, 1967 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources,
1968 ".", 1968 ".",
1969 "//chrome") 1969 "//chrome")
1970 } 1970 }
1971 } 1971 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698