diff --git a/.gitignore b/.gitignore index 2427f32cb1..b372738c83 100644 --- a/.gitignore +++ b/.gitignore @@ -24,11 +24,12 @@ testserver.log /toolchain_build/src/ # Ignore these absolute directories (relative to native_client directory) -/build/Debug/ -/build/Release/ +/tools/build/Debug/ +/tools/build/Release/ /chromebinaries/ /scons-out/ /toolchain/ +/toolchain /tools/BUILD/ /tools/out/ /tools/perf_expectations/ @@ -51,3 +52,6 @@ testserver.log # Ignore the hermetic cygwin used on windows toolchain builds. /cygwin/ + +# It is common practice with CMake to build in build/ +/build/ diff --git a/.gn b/.gn deleted file mode 100644 index 5c3a24b2a4..0000000000 --- a/.gn +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is used by the experimental meta-buildsystem in native_client to -# find the root of the source tree and to set startup options. - -# The location of the top of the build (BUILD.gn). -root = "//native_client" - -# The location of the build configuration file. -buildconfig = "//build/config/BUILDCONFIG.gn" - -# The python interpreter to use by default. On Windows, this will look -# for python3.exe and python3.bat. -script_executable = "python3" - -# The secondary source root is a parallel directory tree where -# GN build files are placed when they can not be placed directly -# in the source tree, e.g. for third party source trees. -secondary_source = "//build/secondary/" - -default_args = { - use_custom_libcxx = false -} \ No newline at end of file diff --git a/BUILD.gn b/BUILD.gn deleted file mode 100644 index 27e0e75c38..0000000000 --- a/BUILD.gn +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This is the root build file for GN. GN will start processing by loading this -# file, and recursively load all dependencies until all dependencies are either -# resolved or known not to exist (which will cause the build to fail). So if -# you add a new build file, there must be some path of dependencies from this -# file to your new one or GN won't know about it. -# -# All targets in this file file are built by default. -# -# Here we declare the meta targets which pull in the various architecture -# combinations of the real targets. -# - -import("config.gni") - -group("trusted") { - deps = [ - "//native_client/src:trusted_targets", - ] -} - -# -# This is the root untrusted target which will build all trusted components -# -group("untrusted") { - deps = [ - "//native_client/src/:irt_targets($toolchain_irt)", - "//native_client/src/:untrusted_targets($toolchain_untrusted)", - ] -} diff --git a/DEPS b/DEPS deleted file mode 100644 index 9ba6122e8a..0000000000 --- a/DEPS +++ /dev/null @@ -1,320 +0,0 @@ -# DEPS files look like -*- Python -*- - -vars = { - # These revisions are slices of the chromium repository. - # Because they come from separate sub-slices, their hashes do not match at - # equivalent revisions. When updating them, use the roll-dep script - # to move them to equivalent revisions. Additionally, because not all - # directories contain commits at each revision, you will need to select - # revisions at latest revision up to a high watermark from each slice. - # Document the high watermark here: - # chrome_rev: 1214139 - "build_rev": "80d1bcf5591e724463be35b794ffe3261a5b9006", # from cr commit position 1039183 - "buildtools_revision": "cd6bd50a8f5eb44620ab501c26806d3eafe45a66", # from cr commit position 1214139 - "clang_rev": "0fc72d33cae3fefb8ced28631f9a8cf7e54fa873", # from cr commit position 1038345 - - # build_overrides/ is a separate, NaCl-specific repo *forked* from - # chromium/src/build_overrides/. It may need to be updated if - # //build_overrides/build.gni changes in Chromium. - "build_overrides_rev": "3a801f70d2dad1d2b4c935103cc44b6f16144f8d", - - # Three lines of non-changing comments so that - # the commit queue can handle CLs rolling lss - # and whatever else without interference from each other. - "lss_revision": "3f6478ac95edf86cd3da300c2c0d34a438f5dbeb", - - "breakpad_rev": "54fa71efbe50fb2b58096d871575b59e12edba6d", - - # Fetch configuration files required for the 'use_remoteexec' gn arg - 'download_remoteexec_cfg': False, - # RBE instance to use for running remote builds - 'rbe_instance': Str('projects/rbe-chromium-untrusted/instances/default_instance'), - # RBE project to download rewrapper config files for. Only needed if - # different from the project used in 'rbe_instance' - 'rewrapper_cfg_project': Str(''), - # reclient CIPD package version - "reclient_version": "re_client_version:0.117.1.21520c6-gomaip", - - # GN CIPD package version. - "gn_version": "git_revision:b79031308cc878488202beb99883ec1f2efd9a6d", - - # Separately pinned repositories, update with roll-dep individually. - "gtest_rev": "2d3543f81d6d4583332f8b60768ade18e0f96220", - "gyp_rev": "e7079f0e0e14108ab0dba58728ff219637458563", - "mingw_rev": "3cc8b140b883a9fe4986d12cfd46c16a093d3527", # from svn revision 7064 - "lcov_rev": "b37daf5968200da8ff520ce65c4e5bce4047dd15", # from svn revision 149720 - "gnu_binutils_rev": "f4003433b61b25666565690caf3d7a7a1a4ec436", # from svn revision 8151 - "nsis_rev": "21b6ad22daa7bfc04b9f1c1805a34622e2607a93", # from svn revision 7071 - "ragel_rev": "da42bb33f1b67c2d70b38ec1d2edf5263271b635", # from svn revision 9010 - "third_party_rev": "d6b76289219c3183f0be9b5fc0be9daedda20e04", - "validator_snapshots_rev": "ef053694ef9b0d98d9bed0b9bb649963084bfc81", - - # Dummy variables for compatibility with //build. - "build_with_chromium": False, - "cros_boards": Str(""), - "cros_boards_with_qemu_images": Str(""), - - "chromium_git": "https://chromium.googlesource.com", -} - -gclient_gn_args_file = 'build/config/gclient_args.gni' -gclient_gn_args = [ - 'build_with_chromium', - 'checkout_android', # this is provided by gclient - 'cros_boards', - 'cros_boards_with_qemu_images', -] - - -deps = { - "breakpad": - Var("chromium_git") + "/breakpad/breakpad.git@" + - Var("breakpad_rev"), - "buildtools": - Var("chromium_git") + "/chromium/src/buildtools.git@" + - Var("buildtools_revision"), - "build": - Var("chromium_git") + "/chromium/src/build.git@" + - Var("build_rev"), - "build_overrides": - Var("chromium_git") + "/native_client/src/build_overrides.git@" + - Var("build_overrides_rev"), - "testing/gtest": - (Var("chromium_git") + "/external/github.com/google/googletest.git@" + - Var("gtest_rev")), - "third_party": - Var("chromium_git") + "/native_client/src/third_party.git@" + - Var("third_party_rev"), - "validator_snapshots": - (Var("chromium_git") + "/native_client/src/validator_snapshots.git@" + - Var("validator_snapshots_rev")), - "third_party/lcov": - Var("chromium_git") + "/chromium/src/third_party/lcov.git@" + - Var("lcov_rev"), - "third_party/lss": - Var("chromium_git") + "/linux-syscall-support.git@" + - Var("lss_revision"), - 'third_party/ninja': { - 'packages': [ - { - # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja - 'package': 'infra/3pp/tools/ninja/${{platform}}', - 'version': 'version:2@1.8.2.chromium.3', - } - ], - 'dep_type': 'cipd', - }, - "tools/clang": - Var("chromium_git") + "/chromium/src/tools/clang.git@" + Var("clang_rev"), - "tools/gyp": - Var("chromium_git") + "/external/gyp.git@" + Var("gyp_rev"), - - 'buildtools/linux64': { - 'packages': [ - { - 'package': 'gn/gn/linux-amd64', - 'version': Var('gn_version'), - } - ], - 'dep_type': 'cipd', - 'condition': 'host_os == "linux"', - }, - 'buildtools/mac': { - 'packages': [ - { - 'package': 'gn/gn/mac-amd64', - 'version': Var('gn_version'), - } - ], - 'dep_type': 'cipd', - 'condition': 'host_os == "mac"', - }, - 'buildtools/win': { - 'packages': [ - { - 'package': 'gn/gn/windows-amd64', - 'version': Var('gn_version'), - } - ], - 'dep_type': 'cipd', - 'condition': 'host_os == "win"', - }, - 'buildtools/reclient': { - 'packages': [ - { - 'package': 'infra/rbe/client/${{platform}}', - 'version': Var('reclient_version'), - } - ], - 'dep_type': 'cipd', - }, -} - -deps_os = { - "win": { - # GNU binutils assembler for x86-32. - "third_party/gnu_binutils": - Var("chromium_git") + - "/native_client/deps/third_party/gnu_binutils.git@" + - Var("gnu_binutils_rev"), - # GNU binutils assembler for x86-64. - "third_party/mingw-w64/mingw/bin": - Var("chromium_git") + - "/native_client/deps/third_party/mingw-w64/mingw/bin.git@" + - Var("mingw_rev"), - "third_party/NSIS": - Var("chromium_git") + "/native_client/deps/third_party/NSIS.git@" + - Var("nsis_rev"), - }, - "unix": { - # Ragel for validator_ragel - "third_party/ragel": - Var("chromium_git") + "/native_client/deps/third_party/ragel.git@" + - Var("ragel_rev"), - }, -} - -hooks = [ - ### - ### From here until the similar marker below, these clauses are copied - ### almost verbatim from chromium/src/DEPS. They are modified to drop - ### the src/ prefix on file names but otherwise they should stay identical. - ### - - { - 'name': 'sysroot_arm', - 'pattern': '.', - 'condition': 'checkout_linux', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm'], - }, - { - 'name': 'sysroot_arm64', - 'pattern': '.', - 'condition': 'checkout_linux', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=arm64'], - }, - { - # Downloads the current stable linux sysroot to build/linux/ if needed. - # This sysroot updates at about the same rate that the chrome build deps - # change. This script is a no-op except for linux users who are doing - # official chrome builds or cross compiling. - 'name': 'sysroot_x64', - 'pattern': '.', - 'condition': 'checkout_linux', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x64'], - }, - { - 'name': 'sysroot_x86', - 'pattern': '.', - 'condition': 'checkout_linux', - 'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py', - '--arch=x86'], - }, - { - # Update the Windows toolchain if necessary. - 'name': 'win_toolchain', - 'pattern': '.', - 'condition': 'checkout_win', - 'action': ['python3', 'build/vs_toolchain.py', 'update'], - }, - { - # Update the Mac toolchain if necessary. - 'name': 'mac_toolchain', - 'pattern': '.', - 'condition': 'checkout_mac', - 'action': ['python3', 'build/mac_toolchain.py'], - }, - { - # Pull clang if needed or requested via GYP_DEFINES. - # Note: On Win, this should run after win_toolchain, as it may use it. - 'name': 'clang', - 'pattern': '.', - 'action': ['python3', 'tools/clang/scripts/update.py'], - }, - { - # Update LASTCHANGE. - 'name': 'lastchange', - 'pattern': '.', - 'action': ['python3', 'build/util/lastchange.py', - '-o', 'build/util/LASTCHANGE'], - }, - # Pull clang-format binaries using checked-in hashes. - { - 'name': 'clang_format_win', - 'pattern': '.', - 'condition': 'host_os == "win"', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'buildtools/win/clang-format.exe.sha1', - ], - }, - { - 'name': 'clang_format_mac', - 'pattern': '.', - 'condition': 'host_os == "mac"', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'buildtools/mac/clang-format.x64.sha1', - ], - }, - { - 'name': 'clang_format_linux', - 'pattern': '.', - 'condition': 'host_os == "linux"', - 'action': [ 'download_from_google_storage', - '--no_resume', - '--no_auth', - '--bucket', 'chromium-clang-format', - '-s', 'buildtools/linux64/clang-format.sha1', - ], - }, - # Download remote exec cfg files - { - 'name': 'fetch_reclient_cfgs', - 'pattern': '.', - 'condition': 'download_remoteexec_cfg', - 'action': ['python3', - 'src/buildtools/reclient_cfgs/fetch_reclient_cfgs.py', - '--rbe_instance', - Var('rbe_instance'), - '--reproxy_cfg_template', - 'reproxy.cfg.template', - '--rewrapper_cfg_project', - Var('rewrapper_cfg_project'), - '--quiet', - ], - }, - - ### - ### End of clauses copied (almost verbatim) from chromium/src/DEPS. - ### - - # Pull NaCl Toolchain binaries. - { - "pattern": ".", - "action": ["python3", - "native_client/build/package_version/package_version.py", - "sync", "--extract", - ], - }, - # Cleanup any stale package_version files. - { - "pattern": ".", - "action": ["python3", - "native_client/build/package_version/package_version.py", - "cleanup", - ], - }, -] - -include_rules = [ - "+native_client/src/include", - "+gtest", -] diff --git a/SConstruct b/SConstruct index cf2aca4857..b901f1e1d8 100755 --- a/SConstruct +++ b/SConstruct @@ -2101,7 +2101,7 @@ def MakeBaseTrustedEnv(platform=None): base_env.Append(BUILD_SCONSCRIPTS = [ # KEEP THIS SORTED PLEASE - 'build/package_version/build.scons', + 'tools/build/package_version/build.scons', 'pynacl/build.scons', 'src/nonsfi/irt/build.scons', 'src/nonsfi/loader/build.scons', @@ -2438,7 +2438,7 @@ def MakeMacEnv(platform=None): # This invocation matches the model in //build/config/mac/mac_sdk.gni. mac_sdk_sysroot, mac_sdk_version = subprocess.check_output([ sys.executable, - os.path.join(os.path.pardir, 'build', 'mac', 'find_sdk.py'), + os.path.join(os.path.pardir, 'tools', 'build', 'mac', 'find_sdk.py'), '--print_sdk_path', mac_sdk_min ], encoding='utf-8').splitlines() @@ -2652,7 +2652,7 @@ def SetUpLinuxEnvMips(env): if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')): print("WARNING: " "MIPS trusted toolchain not found - try running:\n" - " build/package_version/package_version.py --packages" + " tools/build/package_version/package_version.py --packages" " linux_x86/mips_trusted sync -x\n" "Or build it yourself with:\n" " tools/trusted_cross_toolchains/trusted-toolchain-creator" diff --git a/buildbot/buildbot_lib.py b/buildbot/buildbot_lib.py index 46a13dff8f..02458b071f 100644 --- a/buildbot/buildbot_lib.py +++ b/buildbot/buildbot_lib.py @@ -88,7 +88,7 @@ def SetupLinuxEnvironment(context): # Override the trusted compiler for mips, clang does not support mips context['clang'] = False # Ensure the trusted mips toolchain is installed. - cmd = ['build/package_version/package_version.py', '--packages', + cmd = ['tools/build/package_version/package_version.py', '--packages', 'linux_x86/mips_trusted', 'sync', '-x'] Command(context, cmd) diff --git a/buildbot/buildbot_linux-glibc-makefile.sh b/buildbot/buildbot_linux-glibc-makefile.sh index 43d774fa5f..e1b16cbda8 100755 --- a/buildbot/buildbot_linux-glibc-makefile.sh +++ b/buildbot/buildbot_linux-glibc-makefile.sh @@ -202,24 +202,24 @@ done echo @@@STEP_LINK@download@http://gsdview.appspot.com/${GSD_BUCKET}/${UPLOAD_LOC}/@@@ echo @@@BUILD_STEP archive_extract_packages@@@ -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc --extract \ --extra-archive gdb_i686_linux.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_linux_x86.tar.bz2 \ tools/core_sdk.tar.bz2,${CORE_SDK}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/core_sdk_linux_x86.tar.bz2 -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --extract \ --extra-archive gdb_i686_linux.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_linux_x86.tar.bz2 echo @@@BUILD_STEP upload_package_info@@@ -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ --cloud-bucket=${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc --revision=${UPLOAD_REV} -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ --cloud-bucket=${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --revision=${UPLOAD_REV} @@ -240,7 +240,7 @@ fail() { # Before we start testing, put in dummy mock archives so gyp can still untar # the entire package. -python build/package_version/package_version.py fillemptytars \ +python tools/build/package_version/package_version.py fillemptytars \ --fill-package nacl_x86_glibc # First run 32bit tests, then 64bit tests. Both should succeed. diff --git a/buildbot/buildbot_mac-glibc-makefile.sh b/buildbot/buildbot_mac-glibc-makefile.sh index 090e5d1675..3e2ee56efd 100755 --- a/buildbot/buildbot_mac-glibc-makefile.sh +++ b/buildbot/buildbot_mac-glibc-makefile.sh @@ -133,24 +133,24 @@ done echo @@@STEP_LINK@download@http://gsdview.appspot.com/${GSD_BUCKET}/${UPLOAD_LOC}/@@@ echo @@@BUILD_STEP archive_extract_packages@@@ -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc --extract \ --extra-archive gdb_x86_64_apple_darwin.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_mac_x86.tar.bz2 \ tools/core_sdk.tar.bz2,${CORE_SDK}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/core_sdk_mac_x86.tar.bz2 -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --extract \ --extra-archive gdb_x86_64_apple_darwin.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_mac_x86.tar.bz2 echo @@@BUILD_STEP upload_package_info@@@ -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ --cloud-bucket ${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc --revision=${UPLOAD_REV} -python build/package_version/package_version.py \ +python tools/build/package_version/package_version.py \ --cloud-bucket ${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --revision=${UPLOAD_REV} @@ -165,7 +165,7 @@ fail() { # Before we start testing, put in dummy mock archives so gyp can still untar # the entire package. -python build/package_version/package_version.py fillemptytars \ +python tools/build/package_version/package_version.py fillemptytars \ --fill-package nacl_x86_glibc export INSIDE_TOOLCHAIN=1 diff --git a/buildbot/buildbot_windows-glibc-makefile.sh b/buildbot/buildbot_windows-glibc-makefile.sh index 941bd07319..438c69a039 100755 --- a/buildbot/buildbot_windows-glibc-makefile.sh +++ b/buildbot/buildbot_windows-glibc-makefile.sh @@ -139,31 +139,31 @@ done echo @@@STEP_LINK@download@http://gsdview.appspot.com/${GSD_BUCKET}/${UPLOAD_LOC}/@@@ echo @@@BUILD_STEP archive_extract_packages@@@ -${NATIVE_PYTHON} build/package_version/package_version.py \ +${NATIVE_PYTHON} tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc --extract \ --extra-archive gdb_i686_w64_mingw32.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_win_x86.tar.bz2 \ tools/core_sdk.tar.bz2,${CORE_SDK}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/core_sdk_win_x86.tar.bz2 -${NATIVE_PYTHON} build/package_version/package_version.py \ +${NATIVE_PYTHON} tools/build/package_version/package_version.py \ archive --archive-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --extract \ --extra-archive gdb_i686_w64_mingw32.tgz \ tools/toolchain.tar.bz2,${TOOL_TOOLCHAIN}@https://storage.googleapis.com/${GSD_BUCKET}/${UPLOAD_LOC}/toolchain_win_x86.tar.bz2 echo @@@BUILD_STEP upload_package_info@@@ -${NATIVE_PYTHON} build/package_version/package_version.py \ +${NATIVE_PYTHON} tools/build/package_version/package_version.py \ --cloud-bucket=${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc --revision=${UPLOAD_REV} -${NATIVE_PYTHON} build/package_version/package_version.py \ +${NATIVE_PYTHON} tools/build/package_version/package_version.py \ --cloud-bucket=${GSD_BUCKET} --annotate \ upload --skip-missing \ --upload-package=${TOOLCHAINNAME}/nacl_x86_glibc_raw --revision=${UPLOAD_REV} # Before we start testing, put in dummy mock archives so gyp can still untar # the entire package. -python3 build/package_version/package_version.py fillemptytars \ +python3 tools/build/package_version/package_version.py fillemptytars \ --fill-package nacl_x86_glibc # sync_backports is obsolete and should probably be removed. diff --git a/pnacl/support/DEPS b/pnacl/support/DEPS deleted file mode 100644 index f9e4bbc539..0000000000 --- a/pnacl/support/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "+native_client/pnacl/support", - "+native_client/src/trusted/service_runtime/include", - "+native_client/src/untrusted", -] diff --git a/site_scons/site_tools/target_platform_windows.py b/site_scons/site_tools/target_platform_windows.py index 1d921e7f9c..ddf5e4867b 100755 --- a/site_scons/site_tools/target_platform_windows.py +++ b/site_scons/site_tools/target_platform_windows.py @@ -390,7 +390,7 @@ def RES(*argv, **karg): # NOTE: cygwin is only required for coverage on windows. ('c:\\cygwin\\bin\\bash -c "' 'PATH=/cygdrive/c/cygwin/bin ' - 'build/filter_windows_lcov.py ' + 'tools/build/filter_windows_lcov.py ' "< `cygpath '${COVERAGE_OUTPUT_FILE}.pre.coverage.lcov'` " "> `cygpath '${COVERAGE_OUTPUT_FILE}'` \""), # TODO(bradnelson): eliminate cygwin dependency. diff --git a/src/BUILD.gn b/src/BUILD.gn deleted file mode 100644 index e0c7c19da6..0000000000 --- a/src/BUILD.gn +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -group("trusted_targets") { - deps = [ - "//native_client/src/shared/imc:imc", - "//native_client/src/shared/platform:platform", - "//native_client/src/trusted/cpu_features:all_cpu_features", - "//native_client/src/trusted/debug_stub:debug_stub", - "//native_client/src/trusted/desc:nrd_xfer", - "//native_client/src/trusted/desc:nrd_xfer", - "//native_client/src/trusted/error_code", - "//native_client/src/trusted/fault_injection:nacl_fault_inject", - "//native_client/src/trusted/interval_multiset:nacl_interval", - "//native_client/src/trusted/nacl_base:nacl_base", - "//native_client/src/trusted/perf_counter:nacl_perf_counter", - "//native_client/src/trusted/platform_qualify:platform_qual_lib", - "//native_client/src/trusted/service_runtime:env_cleanser", - "//native_client/src/trusted/service_runtime:sel", - "//native_client/src/trusted/service_runtime:sel_ldr", - "//native_client/src/trusted/service_runtime:sel_main", - "//native_client/src/trusted/validator/driver:elf_load", - "//native_client/src/trusted/validator/driver:ncval_new", - "//native_client/src/trusted/validator_ragel:rdfa_validator", - ] - if (is_linux || is_chromeos) { - deps += [ "//native_client/src/nonsfi/loader:nonsfi_loader" ] - } -} - -group("tests") { - testonly = true - deps = [ - "//native_client/tests:large_tests", - "//native_client/tests:medium_tests", - "//native_client/tests:small_tests", - ] -} - -if (is_nacl) { - group("untrusted_targets") { - deps = [ - "//native_client/src/shared/gio:gio", - "//native_client/src/shared/platform:platform", - "//native_client/src/untrusted/elf_loader:elf_loader", - "//native_client/src/untrusted/nacl:imc_syscalls", - "//native_client/tests/hello_world:hello_world", - ] - } - - group("irt_targets") { - deps = [ - "//native_client/src/untrusted/irt:irt_core", - ] - } -} diff --git a/src/include/DEPS b/src/include/DEPS deleted file mode 100644 index 31c13896d8..0000000000 --- a/src/include/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "+native_client/src/include", - "+native_client/src/shared/platform/nacl_log.h", - "+native_client/src/trusted/service_runtime/include/bits/wordsize.h", -] diff --git a/src/nonsfi/DEPS b/src/nonsfi/DEPS deleted file mode 100644 index 514bf17a19..0000000000 --- a/src/nonsfi/DEPS +++ /dev/null @@ -1,13 +0,0 @@ -include_rules = [ - "+native_client/src/nonsfi", - "+native_client/src/public", - "+native_client/src/shared/platform", - "+native_client/src/trusted/service_runtime/include", - "+native_client/src/trusted/service_runtime/nacl_config.h", - # TODO(mseaborn): Move irt.h and irt_dev.h to src/public. - "+native_client/src/untrusted/irt/irt.h", - "+native_client/src/untrusted/irt/irt_dev.h", - "+native_client/src/untrusted/irt/irt_interfaces.h", - "+native_client/src/untrusted/nacl", - "+native_client/src/untrusted/pthread/pthread_internal.h", -] diff --git a/src/nonsfi/irt/BUILD.gn b/src/nonsfi/irt/BUILD.gn deleted file mode 100644 index d8106d5271..0000000000 --- a/src/nonsfi/irt/BUILD.gn +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2015 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("irt_interfaces") { - sources = [ - "../../untrusted/irt/irt_query_list.c", - "irt_interfaces.c", - "irt_random.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - ] -} - -if (is_nacl) { - static_library("nacl_sys_private") { - cflags = [ "-fgnu-inline-asm" ] - - sources = [ - "../../untrusted/irt/irt_query_list.c", - "../../untrusted/pthread/nc_condvar.c", - "../../untrusted/pthread/nc_mutex.c", - "../../untrusted/pthread/nc_thread.c", - "../../untrusted/pthread/stack_end.c", - "../../untrusted/valgrind/dynamic_annotations.c", - "../linux/directory.c", - "../linux/irt_signal_handling.c", - "../linux/linux_futex.c", - "../linux/linux_pthread_private.c", - "../linux/linux_sys_private.c", - "irt_icache.c", - "irt_interfaces.c", - "irt_random.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - ] - } -} diff --git a/src/nonsfi/loader/BUILD.gn b/src/nonsfi/loader/BUILD.gn deleted file mode 100644 index 309ef372e7..0000000000 --- a/src/nonsfi/loader/BUILD.gn +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2015 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("elf_loader") { - sources = [ - "elf_loader.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} - -if (is_linux || is_nacl || is_chromeos) { - executable("nonsfi_loader") { - sources = [ - "elf_loader_main.c", - ] - - deps = [ - ":elf_loader", - "//native_client/src/nonsfi/irt:irt_interfaces", - "//native_client/src/shared/platform", - ] - if (is_nacl) { - deps += [ - "//native_client/src/nonsfi/irt:nacl_sys_private", - "//native_client/src/untrusted/nacl", - ] - } - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } - } -} diff --git a/src/public/DEPS b/src/public/DEPS deleted file mode 100644 index cac40a5f58..0000000000 --- a/src/public/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "+native_client/src/public", - "+native_client/src/shared/imc/nacl_imc_c.h", - "+native_client/src/trusted/service_runtime/nacl_size_t.h", -] diff --git a/src/shared/DEPS b/src/shared/DEPS deleted file mode 100644 index eaef504342..0000000000 --- a/src/shared/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -include_rules = [ - "+native_client/src/public", - "+native_client/src/shared", - "+native_client/src/trusted", -] diff --git a/src/shared/gio/BUILD.gn b/src/shared/gio/BUILD.gn deleted file mode 100644 index 02fc134264..0000000000 --- a/src/shared/gio/BUILD.gn +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("gio") { - sources = [ - "gio.c", - "gprintf.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - ] -} diff --git a/src/shared/imc/BUILD.gn b/src/shared/imc/BUILD.gn deleted file mode 100644 index bc7f7fe3fd..0000000000 --- a/src/shared/imc/BUILD.gn +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("imc") { - sources = [ - "nacl_imc_common.cc", - ] - - if (current_os == "nacl") { - sources += [ "nacl/nacl_imc.cc" ] - } - - if (current_os == "mac") { - sources += [ - "osx/nacl_imc.cc", - "posix/nacl_imc_posix.cc", - ] - } - - if (is_linux || is_chromeos) { - sources += [ - "linux/nacl_imc.cc", - "posix/nacl_imc_posix.cc", - ] - - libs = [ "rt" ] - } - - if (current_os == "win") { - sources += [ - "win/nacl_imc.cc", - "win/nacl_shm.cc", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} diff --git a/src/shared/platform/BUILD.gn b/src/shared/platform/BUILD.gn deleted file mode 100644 index 503427fa29..0000000000 --- a/src/shared/platform/BUILD.gn +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/shared/platform/build.scons. - -static_library("platform") { - cflags_c = [ - "-Wno-cast-function-type-mismatch", - "-Wno-unknown-warning-option" - ] - - if (current_os == "nacl") { - sources = [ - "nacl_check.c", - "nacl_log.c", - "posix/condition_variable.c", - "posix/lock.c", - "posix/nacl_error.c", - "posix/nacl_exit.c", - "posix/nacl_thread_id.c", - "posix/nacl_threads.c", - "posix/nacl_timestamp.c", - "nacl_sync_checked.c", - "refcount_base.cc", - ] - } else { - sources = [ - "nacl_check.c", - "nacl_global_secure_random.c", - "nacl_host_desc_common.c", - "nacl_interruptible_condvar.c", - "nacl_interruptible_mutex.c", - "nacl_log.c", - "nacl_secure_random_common.c", - "nacl_sync_checked.c", - "nacl_time_common.c", - "platform_init.c", - "refcount_base.cc", - ] - if (current_os != "win") { - sources += [ - "posix/aligned_malloc.c", - "posix/condition_variable.c", - "posix/lock.c", - "posix/nacl_error.c", - "posix/nacl_exit.c", - "posix/nacl_fast_mutex.c", - "posix/nacl_file_lock.c", - "posix/nacl_find_addrsp.c", - "posix/nacl_host_desc.c", - "posix/nacl_secure_random.c", - "posix/nacl_thread_id.c", - "posix/nacl_threads.c", - "posix/nacl_time.c", - "posix/nacl_timestamp.c", - ] - } - - if (current_os == "win") { - sources += [ - "win/aligned_malloc.c", - "win/condition_variable.cc", - "win/lock.cc", - "win/lock_impl_win.cc", - "win/nacl_clock.c", - "win/nacl_error.c", - "win/nacl_exit.c", - "win/nacl_fast_mutex.c", - "win/nacl_find_addrsp.c", - "win/nacl_host_desc.c", - "win/nacl_host_dir.c", - "win/nacl_secure_random.c", - "win/nacl_semaphore.c", - "win/nacl_sync_win.cc", - "win/nacl_threads.c", - "win/nacl_time.c", - "win/nacl_timestamp.c", - "win/port_win.c", - "win/xlate_system_error.c", - ] - } - - if (current_os == "mac") { - sources += [ - "osx/nacl_clock.c", - "osx/nacl_host_dir.c", - "osx/nacl_semaphore.c", - ] - } - - if (is_linux || is_chromeos) { - sources += [ - "linux/nacl_clock.c", - "linux/nacl_host_dir.c", - "linux/nacl_semaphore.c", - ] - } - - if (current_os == "win") { - cflags_c = [ - "/DUNICODE", - "/D_CRT_RAND_S", - "/D_UNICODE", - ] - } - } - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/gio:gio", - ] -} diff --git a/src/shared/platform/DEPS b/src/shared/platform/DEPS deleted file mode 100644 index f6a0c202c9..0000000000 --- a/src/shared/platform/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - # Allow nacl toolchain headers. - "+nacl", -] diff --git a/src/third_party/gtest/BUILD.gn b/src/third_party/gtest/BUILD.gn deleted file mode 100644 index f203ba1300..0000000000 --- a/src/third_party/gtest/BUILD.gn +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Chromium's GN configuration for gtest now lives at testing/gtest/BUILD.gn. -# -# This configuration is left in the tree because it is pulled by V8 and PDFium, -# and will be removed as soon as the projects switch off of it. -# -# Details at http://crbug.com/630705 and http://crrev.com/2779193002 - -import("//build_overrides/gtest.gni") - -#root = "../.." - -config("gtest_config") { - visibility = [ - ":*", - "//testing/gmock:*", # gmock also shares this config. - ] - - defines = [ - # In order to allow regex matches in gtest to be shared between Windows - # and other systems, we tell gtest to always use it's internal engine. - "GTEST_HAS_POSIX_RE=0", - "GTEST_LANG_CXX11=1", - ] - - # Gtest headers need to be able to find themselves. - include_dirs = [ "../../../../testing/gtest/include", "../../../../testing/gtest/" ] - - cflags = [ "-Wno-deprecated-copy-with-user-provided-copy" ] - if (is_win) { - cflags += [ "/wd4800" ] # Unused variable warning. - } -} - -config("gtest_direct_config") { - visibility = [ ":*" ] - defines = [ "UNIT_TEST" ] -} - -config("gtest_warnings") { - if (is_win && is_clang) { - # The Mutex constructor initializer list in gtest-port.cc is incorrectly - # ordered. See - # https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ. - cflags = [ "-Wno-reorder" ] - } -} - -static_library("gtest") { - testonly = true - sources = [ - "include/gtest/gtest-death-test.h", - "include/gtest/gtest-message.h", - "include/gtest/gtest-param-test.h", - "include/gtest/gtest-printers.h", - "include/gtest/gtest-spi.h", - "include/gtest/gtest-test-part.h", - "include/gtest/gtest-typed-test.h", - "include/gtest/gtest.h", - "include/gtest/gtest_pred_impl.h", - "include/gtest/internal/gtest-death-test-internal.h", - "include/gtest/internal/gtest-filepath.h", - "include/gtest/internal/gtest-internal.h", - "include/gtest/internal/gtest-linked_ptr.h", - "include/gtest/internal/gtest-param-util-generated.h", - "include/gtest/internal/gtest-param-util.h", - "include/gtest/internal/gtest-port.h", - "include/gtest/internal/gtest-string.h", - "include/gtest/internal/gtest-tuple.h", - "include/gtest/internal/gtest-type-util.h", - - #"gtest/src/gtest-all.cc", # Not needed by our build. - "../../../../testing/gtest/src/gtest-death-test.cc", - "../../../../testing/gtest/src/gtest-filepath.cc", - "../../../../testing/gtest/src/gtest-internal-inl.h", - "../../../../testing/gtest/src/gtest-port.cc", - "../../../../testing/gtest/src/gtest-printers.cc", - "../../../../testing/gtest/src/gtest-test-part.cc", - "../../../../testing/gtest/src/gtest-typed-test.cc", - "../../../../testing/gtest/src/gtest.cc", - ] - deps = [] - - include_dirs = [ "." ] - - all_dependent_configs = [ ":gtest_config" ] - public_configs = [ ":gtest_direct_config" ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - "//build/config/compiler:no_chromium_code", - - # Must be after no_chromium_code for warning flags to be ordered correctly. - ":gtest_warnings", - ] -} - -source_set("gtest_main") { - testonly = true - sources = [ - "../../../../testing/gtest/src/gtest_main.cc", - ] - deps = [ - ":gtest", - ] -} diff --git a/src/tools/tls_edit/BUILD.gn b/src/tools/tls_edit/BUILD.gn deleted file mode 100644 index fa5c32c9d8..0000000000 --- a/src/tools/tls_edit/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -executable("tls_edit") { - sources = [ - "tls_edit.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - "//build/win:default_exe_manifest", - "//native_client/src/shared/platform:platform", - "//native_client/src/trusted/validator_ragel:rdfa_validator", - ] - - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} diff --git a/src/tools/tls_edit/DEPS b/src/tools/tls_edit/DEPS deleted file mode 100644 index 63774ad1a6..0000000000 --- a/src/tools/tls_edit/DEPS +++ /dev/null @@ -1,4 +0,0 @@ -include_rules = [ - "+native_client/src/shared", - "+native_client/src/trusted", -] diff --git a/src/trusted/DEPS b/src/trusted/DEPS deleted file mode 100644 index 13c7b33cb6..0000000000 --- a/src/trusted/DEPS +++ /dev/null @@ -1,6 +0,0 @@ -include_rules = [ - "+native_client/src/public", - "+native_client/src/shared", - "+native_client/src/trusted", - "+third_party/lss", -] diff --git a/src/trusted/cpu_features/BUILD.gn b/src/trusted/cpu_features/BUILD.gn deleted file mode 100644 index b557a11684..0000000000 --- a/src/trusted/cpu_features/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//native_client/src/trusted/asm.gni") - -group("all_cpu_features") { - deps = [ - ":cpu_features", - ] -} - -if (current_toolchain == nacl_asm_toolchain) { - source_set("cpu_features_asm") { - if (current_cpu == "x64" || current_cpu == "x86") { - sources = [ - "arch/x86/cpu_xgetbv.S", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] - } -} - -source_set("cpu_features") { - include_dirs = [ "." ] - sources = [ - "arch/arm/cpu_arm.c", - "arch/mips/cpu_mips.c", - ] - - if (current_cpu == "x64" || current_cpu == "x86") { - sources += [ - "arch/x86/cpu_x86.c", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ":cpu_features_asm($nacl_asm_toolchain)", - ] -} diff --git a/src/trusted/debug_stub/BUILD.gn b/src/trusted/debug_stub/BUILD.gn deleted file mode 100644 index 44db545b96..0000000000 --- a/src/trusted/debug_stub/BUILD.gn +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -import("//build/config/sanitizers/sanitizers.gni") - -static_library("debug_stub") { - sources = [ - "abi.cc", - "debug_stub.cc", - "nacl_debug.cc", - "packet.cc", - "session.cc", - "target.cc", - "thread_common.cc", - "transport_common.cc", - "transport_ipc.cc", - "util.cc", - ] - if (current_os != "win") { - sources += [ - "posix/debug_stub_posix.cc", - "posix/platform_impl.cc", - "posix/thread_impl.cc", - ] - } - if (current_os == "win") { - sources += [ - "win/debug_stub_win.cc", - "win/platform_impl.cc", - "win/thread_impl.cc", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} - -executable("gdb_rsp_unittest") { - sources = [ - "abi_test.cc", - "packet_test.cc", - "session_test.cc", - "test.cc", - "util_test.cc", - ] - - deps = [ - ":debug_stub", - "//build/config/nacl:nacl_base", - "//build/win:default_exe_manifest", - ] - - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} diff --git a/src/trusted/desc/BUILD.gn b/src/trusted/desc/BUILD.gn deleted file mode 100644 index 6e53f02b00..0000000000 --- a/src/trusted/desc/BUILD.gn +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("nrd_xfer") { - sources = [ - "nacl_desc_base.c", - "nacl_desc_cond.c", - "nacl_desc_custom.c", - "nacl_desc_dir.c", - "nacl_desc_effector_trusted_mem.c", - "nacl_desc_imc.c", - "nacl_desc_imc_shm.c", - "nacl_desc_invalid.c", - "nacl_desc_io.c", - "nacl_desc_mutex.c", - "nacl_desc_null.c", - "nacl_desc_quota.c", - "nacl_desc_quota_interface.c", - "nacl_desc_semaphore.c", - "nacl_desc_sync_socket.c", - "nrd_all_modules.c", - "nrd_xfer.c", - ] - if (current_os != "win") { - sources += [ - "posix/nacl_desc.c", - "posix/nacl_desc_conn_cap.c", - "posix/nacl_desc_imc_bound_desc.c", - "posix/nacl_makeboundsock.c", - ] - } else { - sources += [ - "win/nacl_desc.c", - "nacl_desc_conn_cap.c", - "nacl_desc_imc_bound_desc.c", - "nacl_makeboundsock.c", - ] - } - - if (current_os == "mac") { - sources += [ - "osx/nacl_desc_imc_shm_mach.c", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/imc:imc", - "//native_client/src/trusted/nacl_base:nacl_base", - ] -} diff --git a/src/trusted/error_code/BUILD.gn b/src/trusted/error_code/BUILD.gn deleted file mode 100644 index 1612e3a0c2..0000000000 --- a/src/trusted/error_code/BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2022 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("error_code") { - sources = [ - "//native_client/src/trusted/service_runtime/nacl_error_code.c", - "//native_client/src/trusted/service_runtime/nacl_error_code.h", - ] - deps = [ "//build/config/nacl:nacl_base" ] -} diff --git a/src/trusted/fault_injection/BUILD.gn b/src/trusted/fault_injection/BUILD.gn deleted file mode 100644 index 092581aad8..0000000000 --- a/src/trusted/fault_injection/BUILD.gn +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/fault_injection/build.scons. - -static_library("nacl_fault_inject") { - sources = [ - "fault_injection.c", - "test_injection.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} diff --git a/src/trusted/interval_multiset/BUILD.gn b/src/trusted/interval_multiset/BUILD.gn deleted file mode 100644 index 8a67493fbd..0000000000 --- a/src/trusted/interval_multiset/BUILD.gn +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/interval_multiset/build.scons. - -static_library("nacl_interval") { - sources = [ - "nacl_interval_list.c", - "nacl_interval_multiset_delete.c", - "nacl_interval_multiset_factory.c", - "nacl_interval_range_tree.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] -} diff --git a/src/trusted/nacl_base/BUILD.gn b/src/trusted/nacl_base/BUILD.gn deleted file mode 100644 index cf2de2857f..0000000000 --- a/src/trusted/nacl_base/BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/nacl_base/build.scons. - -static_library("nacl_base") { - sources = [ - "nacl_refcount.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} diff --git a/src/trusted/perf_counter/BUILD.gn b/src/trusted/perf_counter/BUILD.gn deleted file mode 100644 index ac63a83d9d..0000000000 --- a/src/trusted/perf_counter/BUILD.gn +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/perf_counter/build.scons. - -static_library("nacl_perf_counter") { - sources = [ - "nacl_perf_counter.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] -} diff --git a/src/trusted/platform_qualify/BUILD.gn b/src/trusted/platform_qualify/BUILD.gn deleted file mode 100644 index 5bebe0be22..0000000000 --- a/src/trusted/platform_qualify/BUILD.gn +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/platform_qualify/build.scons. - -static_library("platform_qual_lib") { - sources = [] - if (current_os != "win") { - sources += [ "posix/nacl_dep_qualify.c" ] - } - - if (current_cpu != "arm") { - sources += [ "arch/x86/nacl_cpuallowlist.c" ] - } - - if (current_cpu == "x86") { - sources += [ "arch/x86_32/nacl_dep_qualify_arch.c" ] - } - - if (current_cpu == "x64") { - sources += [ "arch/x86_64/nacl_dep_qualify_arch.c" ] - } - - if (current_cpu == "arm") { - sources += [ - "arch/arm/nacl_dep_qualify_arch.c", - "arch/arm/nacl_qualify_fpu.c", - "arch/arm/nacl_qualify_sandbox_instrs.c", - "arch/arm/nacl_qualify_unaligned.c", - ] - } - - if (current_cpu == "mipsel") { - sources += ["arch/mips/nacl_qualify_fpu.c"] - } - - if (current_os == "win") { - sources += [ - "win/nacl_dep_qualify.c", - "win/nacl_os_qualify.c", - ] - } - - if (current_os == "mac") { - sources += [ "osx/nacl_os_qualify.c" ] - } - - if (is_linux || is_chromeos) { - sources += [ "linux/nacl_os_qualify.c" ] - } - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/cpu_features:cpu_features", - ] -} - -if (current_cpu != "arm" && current_cpu != "mipsel") { - static_library("vcpuid") { - cflags_c = [] - sources = [ - "arch/x86/vcpuid.c", - ] - - if (current_os == "linux") { - cflags_c += [ "-msse3" ] - } - - if (current_os == "mac") { - cflags_c += [ "-mdynamic-no-pic" ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] - } -} diff --git a/src/trusted/service_runtime/BUILD.gn b/src/trusted/service_runtime/BUILD.gn deleted file mode 100644 index 2d1236b2da..0000000000 --- a/src/trusted/service_runtime/BUILD.gn +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/toolchain/toolchain.gni") -import("//native_client/src/trusted/asm.gni") - -if (is_mac) { - import("//build/config/sysroot.gni") -} - -source_set("sel_main") { - sources = [ "sel_main.c" ] - deps = [ - ":sel", - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/debug_stub:debug_stub", - ] -} - -source_set("sel_main_chrome") { - sources = [ "sel_main_chrome.c" ] - deps = [ - ":sel", - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/debug_stub:debug_stub", - ] -} - -source_set("env_cleanser") { - sources = [ "env_cleanser.c" ] - deps = [ "//build/config/nacl:nacl_base" ] -} - -if (current_toolchain == nacl_asm_toolchain) { - source_set("sel_asm") { - if (current_cpu == "x86") { - sources = [ - "arch/x86_32/nacl_switch_32.S", - "arch/x86_32/nacl_switch_all_regs_asm_32.S", - "arch/x86_32/nacl_syscall_32.S", - "arch/x86_32/springboard.S", - "arch/x86_32/tramp_32.S", - ] - } else if (current_cpu == "x64") { - sources = [ - "arch/x86_64/nacl_switch_64.S", - "arch/x86_64/nacl_syscall_64.S", - "arch/x86_64/tramp_64.S", - ] - if (is_win) { - sources += [ - "arch/x86_64/fnstcw.S", - "arch/x86_64/fxsaverstor.S", - "win/exception_patch/exit_fast.S", - "win/exception_patch/intercept.S", - ] - } - } else if (current_cpu == "arm") { - sources = [ - "arch/arm/nacl_switch.S", - "arch/arm/nacl_syscall.S", - "arch/arm/tramp_arm.S", - ] - } else if (current_cpu == "mipsel") { - sources = [ - "arch/mips/nacl_switch.S", - "arch/mips/nacl_syscall.S", - "arch/mips/tramp_mips.S", - ] - } - deps = [ "//build/config/nacl:nacl_base" ] - } -} - -source_set("sel") { - sources = [ - "dyn_array.c", - "elf_util.c", - "filename_util.cc", - "load_file.c", - "nacl_all_modules.c", - "nacl_app_thread.c", - "nacl_copy.c", - "nacl_desc_effector_ldr.c", - "nacl_error_gio.c", - "nacl_error_log_hook.c", - "nacl_globals.c", - "nacl_resource.c", - "nacl_signal_common.c", - "nacl_stack_safety.c", - "nacl_syscall_common.c", - "nacl_syscall_hook.c", - "nacl_syscall_list.c", - "nacl_text.c", - "nacl_valgrind_hooks.c", - "sel_addrspace.c", - "sel_ldr.c", - "sel_ldr_filename.cc", - "sel_ldr_standard.c", - "sel_main_common.c", - "sel_mem.c", - "sel_qualify.c", - "sel_validate_image.c", - "sys_clock.c", - "sys_exception.c", - "sys_fdio.c", - "sys_filename.c", - "sys_futex.c", - "sys_imc.c", - "sys_list_mappings.c", - "sys_memory.c", - "sys_parallel_io.c", - "sys_random.c", - "thread_suspension_common.c", - "thread_suspension_unwind.c", - ] - - if (is_linux || is_chromeos) { - sources += [ "linux/nacl_signal.c" ] - } - - if (is_mac) { - sources += [ - "osx/crash_filter.c", - "osx/mach_exception_handler.c", - "osx/mach_thread_map.c", - "osx/nacl_ldt.c", - "osx/nacl_thread_nice.c", - "osx/thread_suspension.c", - "posix/addrspace_teardown.c", - "posix/sel_memory.c", - "posix/x86/sel_segments.c", - ] - } - - if (is_win) { - sources += [ - "win/addrspace_teardown.c", - "win/debug_exception_handler.c", - "win/debug_exception_handler_standalone.c", - "win/nacl_ldt.c", - "win/nacl_thread_nice.c", - "win/sel_memory.c", - "win/sel_segments.c", - "win/thread_handle_map.c", - ] - } - - if (current_cpu == "arm") { - sources += [ - "arch/arm/nacl_app.c", - "arch/arm/nacl_switch_to_app_arm.c", - "arch/arm/nacl_tls.c", - "arch/arm/sel_addrspace_arm.c", - "arch/arm/sel_ldr_arm.c", - "arch/arm/sel_rt.c", - "linux/nacl_signal_arm.c", - ] - } - - if (current_cpu == "mipsel") { - sources += [ - "arch/mips/nacl_app.c", - "arch/mips/nacl_switch_to_app_mips.c", - "arch/mips/nacl_tls.c", - "arch/mips/sel_addrspace_mips.c", - "arch/mips/sel_ldr_mips.c", - "arch/mips/sel_rt.c", - "linux/nacl_signal_mips.c", - ] - } - - if (is_linux || is_chromeos || is_android) { - sources += [ - "linux/nacl_bootstrap_args.c", - "linux/nacl_thread_nice.c", - "linux/r_debug.c", - "linux/reserved_at_zero.c", - "linux/thread_suspension.c", - "posix/addrspace_teardown.c", - "posix/sel_memory.c", - ] - if (current_cpu == "x86" || current_cpu == "x64") { - sources += [ - "linux/x86/nacl_ldt.c", - "posix/x86/sel_segments.c", - ] - } - if (current_cpu == "arm") { - sources += [ "linux/arm/sel_segments.c" ] - } - if (current_cpu == "mipsel") { - sources += [ "linux/mips/sel_segments.c" ] - } - } - - if (is_posix) { - sources += [ - "posix/nacl_signal_stack.c", - "posix/sel_addrspace_posix.c", - ] - } - - if (is_win) { - sources += [ - "win/nacl_signal_stack.c", - "win/sel_addrspace_win.c", - "win/thread_suspension.c", - "win/vm_hole.c", - ] - } else { - sources += [ "generic/vm_hole.c" ] - } - - if (current_cpu == "x86" || current_cpu == "x64") { - sources += [ "arch/x86/nacl_ldt_x86.c" ] - } - - if (current_cpu == "x86") { - sources += [ - "arch/x86_32/nacl_app_32.c", - "arch/x86_32/nacl_switch_all_regs_32.c", - "arch/x86_32/nacl_switch_to_app_32.c", - "arch/x86_32/nacl_tls_32.c", - "arch/x86_32/sel_addrspace_x86_32.c", - "arch/x86_32/sel_ldr_x86_32.c", - "arch/x86_32/sel_rt_32.c", - ] - if (is_mac) { - sources += [ "osx/nacl_signal_32.c" ] - } - if (is_linux || is_chromeos) { - sources += [ "linux/nacl_signal_32.c" ] - } - if (is_win) { - sources += [ "win/nacl_signal_32.c" ] - } - } - - if (current_cpu == "x64") { - sources += [ - "arch/x86_64/nacl_app_64.c", - "arch/x86_64/nacl_switch_to_app_64.c", - "arch/x86_64/nacl_tls_64.c", - "arch/x86_64/sel_ldr_x86_64.c", - "arch/x86_64/sel_rt_64.c", - ] - if (is_mac) { - sources += [ - "arch/x86_64/sel_addrspace_posix_x86_64.c", - "osx/nacl_signal_64.c", - ] - } - if (is_linux || is_chromeos) { - sources += [ - "arch/x86_64/sel_addrspace_posix_x86_64.c", - "linux/nacl_signal_64.c", - ] - } - if (is_win) { - sources += [ - # We assemble the .asm assembly file with the Microsoft assembler - # because we need to generate x86-64 Windows unwind info, which the - # GNU assembler we use elsewhere does not support. - "arch/x86_64/nacl_switch_unwind_win.asm", - "arch/x86_64/sel_addrspace_win_x86_64.c", - "win/exception_patch/ntdll_patch.c", - "win/nacl_signal_64.c", - ] - } - defines = [ "NACL_X86_64_ZERO_BASED_SANDBOX=0" ] - } - - deps = [ - ":env_cleanser", - ":sel_asm($nacl_asm_toolchain)", - "//build/config/nacl:nacl_base", - "//native_client/src/shared/gio:gio", - "//native_client/src/shared/imc:imc", - "//native_client/src/shared/platform:platform", - "//native_client/src/trusted/desc:nrd_xfer", - "//native_client/src/trusted/error_code", - "//native_client/src/trusted/fault_injection:nacl_fault_inject", - "//native_client/src/trusted/interval_multiset:nacl_interval", - "//native_client/src/trusted/nacl_base:nacl_base", - "//native_client/src/trusted/perf_counter:nacl_perf_counter", - "//native_client/src/trusted/platform_qualify:platform_qual_lib", - "//native_client/src/trusted/validator:validation_cache", - "//native_client/src/trusted/validator:validators", - ] - - if (current_os == "mac") { - deps += [ ":nacl_exc" ] - sources += [ "$target_gen_dir/nacl_exc_server.c" ] - } -} - -if (current_os == "mac") { - import("//build/config/mac/mac_sdk.gni") - - action("nacl_exc") { - script = "osx/run_mig.py" - sources = [ mac_sdk_path + "/usr/include/mach/exc.defs" ] - outputs = [ - "$target_gen_dir/nacl_exc.h", - "$target_gen_dir/nacl_exc_server.c", - ] - args = rebase_path(sources, root_build_dir) + - rebase_path(outputs, root_build_dir) - if (!use_system_xcode) { - import("//build/config/clang/clang.gni") - clang_path = - rebase_path("$clang_base_path/bin/", root_build_dir) + "clang" - mig_path = mac_bin_path + "mig" - migcom_path = mac_bin_path + "../libexec/migcom" - - args += [ - "--clang-path", - clang_path, - "--mig-path", - mig_path, - "--migcom-path", - migcom_path, - ] - } else { - deps = [ "//build/config/mac:sdk_inputs" ] - } - args += [ - "--sdk", - rebase_path(mac_sdk_path, root_build_dir), - ] - } -} - -executable("sel_ldr") { - sources = [ "nacl_test_injection_main.c" ] - deps = [ - ":sel_main", - "//build/win:default_exe_manifest", - ] - if (is_linux || is_chromeos) { - ldflags = [ "-pie" ] - data_deps = [ "linux:bootstrap" ] - } - if (is_linux) { - ldflags += [ - "-static-libstdc++", - # For the chromium build, -static-libstdc++ will be unused. - # This is intentional, so don't warn about it. - "-Wno-unused-command-line-argument", - ] - } -} diff --git a/src/trusted/service_runtime/linux/BUILD.gn b/src/trusted/service_runtime/linux/BUILD.gn deleted file mode 100644 index 29bc499f5b..0000000000 --- a/src/trusted/service_runtime/linux/BUILD.gn +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# We use a special toolchain to build nacl_helper_bootstrap. This -# seems a bit excessive for compiling one source file. But it is -# the most reasonable way to instantiate the configs with different -# settings such as use_debug_fission=false. - -import("//build/config/nacl/host_toolchain.gni") - -here = get_label_info(".", "dir") -bootstrap_toolchain = here + "/toolchain:nacl_bootstrap_" + current_cpu - -if (default_toolchain == "//build/toolchain/cros:target") { - import("//build/toolchain/cros_toolchain.gni") - bootstrap_toolchain = "//build/toolchain/cros:nacl_bootstrap" -} - -if (current_toolchain == bootstrap_toolchain) { - bootstrap_lib_path = "$target_out_dir/libnacl_bootstrap_lib.a" - bootstrap_raw_path = "$target_out_dir/nacl_bootstrap_raw" - bootstrap_exe_path = "$root_out_dir/nacl_helper_bootstrap" - - linker_script_path = rebase_path("nacl_bootstrap.x") - - if (current_cpu == "x64") { - nacl_reserve_top = "0x0" - linker_emulation = "elf_x86_64" - } - if (current_cpu == "x86") { - nacl_reserve_top = "0x40000000" - linker_emulation = "elf_i386" - } - if (current_cpu == "arm") { - nacl_reserve_top = "0x40002000" - linker_emulation = "armelf_linux_eabi" - } - if (current_cpu == "mipsel") { - nacl_reserve_top = "0x40008000" - linker_emulation = "elf32ltsmip" - } - - static_library("nacl_bootstrap_lib") { - # This code has very specific requirements related to its static - # linking and minimal libc use. It cannot support the normal variety - # of build configs that the rest of the code is built with. So it - # resets the list of configs to empty, and then builds up from scratch - # using only the basics that work here. - configs = [] - configs += [ - "//build/config/compiler:chromium_code", - "//build/config/compiler:clang_revision", - "//build/config/compiler:compiler_cpu_abi", - "//build/config/compiler:compiler_deterministic", - "//build/config/compiler:default_optimization", - "//build/config/compiler:default_symbols", - "//build/config/compiler:runtime_library", - ] - - include_dirs = [ "//" ] - - cflags = [ - "-fno-builtin", - - # These might be the defaults in the compiler configuration, - # but we want them all disabled for this build. - "-fno-stack-protector", - "-fno-pic", - "-fno-PIC", - "-fno-pie", - "-fno-PIE", - # Automatic initialization generates memset calls - "-ftrivial-auto-var-init=uninitialized", - ] - - sources = [ - "nacl_bootstrap.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - ] - } - - action("nacl_bootstrap_raw") { - deps = [ - ":nacl_bootstrap_lib", - ] - script = "ld_bfd.py" - - sources = [ - bootstrap_lib_path, - linker_script_path, - ] - outputs = [ - bootstrap_raw_path, - ] - args = [ - "--compiler", - nacl_bootstrap_compiler, - "-m", - linker_emulation, - "--build-id", - - # This program is (almost) entirely - # standalone. It has its own startup code, so - # no crt1.o for it. It is statically linked, - # and on x86 it does not use libc at all. - # However, on ARM it needs a few (safe) things - # from libc. - "-static", - - # On x86-64, the default page size with some linkers is 2M - # rather than the real Linux page size of 4K. And on ARM, the - # default page size is 32K. A larger page size is - # incompatible with our custom linker script's special layout. - # NOTE: It's important that this option come before --script! - "-z", - "max-page-size=0x1000", - - # Link with custom linker script for special - # layout. The script uses the symbol RESERVE_TOP. - "--defsym", - "RESERVE_TOP=" + nacl_reserve_top, - "--script=" + rebase_path(linker_script_path, root_build_dir), - "-o", - rebase_path(bootstrap_raw_path, root_build_dir), - - "--whole-archive", - rebase_path(bootstrap_lib_path, root_build_dir), - "--no-whole-archive", - ] - } - - action("munge_nacl_helper_bootstrap") { - deps = [ - ":nacl_bootstrap_raw", - ] - - script = "nacl_bootstrap_munge_phdr.py" - inputs = [ - bootstrap_raw_path, - ] - outputs = [ - bootstrap_exe_path, - ] - args = rebase_path(inputs + outputs, root_build_dir) - } -} else if (is_linux || is_chromeos) { - copy("bootstrap") { - bootstrap = ":munge_nacl_helper_bootstrap($bootstrap_toolchain)" - - bootstrap_out_dir = get_label_info(bootstrap, "root_out_dir") - - deps = [ - bootstrap, - ] - sources = [ - "$bootstrap_out_dir/nacl_helper_bootstrap", - ] - outputs = [ - "$root_out_dir/nacl_helper_bootstrap", - ] - } -} diff --git a/src/trusted/service_runtime/linux/toolchain/BUILD.gn b/src/trusted/service_runtime/linux/toolchain/BUILD.gn deleted file mode 100644 index 7e71490798..0000000000 --- a/src/trusted/service_runtime/linux/toolchain/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2015 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/toolchain/gcc_toolchain.gni") - -# This toolchain's sole purpose is to compile nacl_helper_bootstrap.c. -# That requires a separate toolchain because that's the most reasonable way -# to instantiate the standard configs in a context where use_debug_fission=false -# when the main build is using use_debug_fission=true. See ../BUILD.gn for -# details. - -template("nacl_bootstrap_toolchain") { - clang_toolchain(target_name) { - toolchain_args = { - current_cpu = invoker.toolchain_cpu - current_os = target_os - use_debug_fission = false - } - } -} - -nacl_bootstrap_toolchain("nacl_bootstrap_x64") { - toolchain_cpu = "x64" -} - -nacl_bootstrap_toolchain("nacl_bootstrap_x86") { - toolchain_cpu = "x86" -} - -nacl_bootstrap_toolchain("nacl_bootstrap_arm") { - toolchain_cpu = "arm" -} - -nacl_bootstrap_toolchain("nacl_bootstrap_mipsel") { - toolchain_cpu = "mipsel" -} diff --git a/src/trusted/validator/BUILD.gn b/src/trusted/validator/BUILD.gn deleted file mode 100644 index e9b69c27bf..0000000000 --- a/src/trusted/validator/BUILD.gn +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("validators") { - sources = [ - "validator_init.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] - - if (current_cpu == "arm") { - deps += [ "//native_client/src/trusted/validator_arm:ncvalidate_arm_v2" ] - } - if (current_cpu == "mipsel") { - deps += [ "//native_client/src/trusted/validator_mips:ncvalidate_mips" ] - } - if (current_cpu == "x86") { - deps += [ "//native_client/src/trusted/validator_ragel:dfa_validate" ] - } - if (current_cpu == "x64") { - deps += [ "//native_client/src/trusted/validator_ragel:dfa_validate" ] - } -} - -static_library("validation_cache") { - sources = [ - "validation_cache.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} diff --git a/src/trusted/validator/driver/BUILD.gn b/src/trusted/validator/driver/BUILD.gn deleted file mode 100644 index 4f4c691626..0000000000 --- a/src/trusted/validator/driver/BUILD.gn +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Autogenerated from src/trusted/validator/driver/build.scons. - -static_library("elf_load") { - sources = [ - "elf_load.cc", - ] - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/platform:platform", - ] -} -executable("ncval_new") { - sources = [ - "ncval.cc", - ] - - deps = [ - ":elf_load", - "//build/config/nacl:nacl_base", - "//build/win:default_exe_manifest", - "//native_client/src/shared/platform:platform", - "//native_client/src/trusted/cpu_features:cpu_features", - "//native_client/src/trusted/validator_arm:arm_validator_core", - "//native_client/src/trusted/validator_arm:arm_validator_reporters", - "//native_client/src/trusted/validator_ragel:rdfa_validator", - ] - - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} diff --git a/src/trusted/validator_arm/BUILD.gn b/src/trusted/validator_arm/BUILD.gn deleted file mode 100644 index d5866fa43a..0000000000 --- a/src/trusted/validator_arm/BUILD.gn +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Generated from GYP - -config("arm_validator_core_config") { - if (is_clang) { - # arm32_decode_actuals_1.cc's has a few `if (true) return ...; return ...;`. - cflags = [ "-Wno-unreachable-code-return" ] - } -} - -static_library("arm_validator_core") { - sources = [ - "address_set.cc", - "inst_classes.cc", - "model.cc", - "arm_helpers.cc", - "validator.cc", - "gen/arm32_decode.cc", - "gen/arm32_decode_actuals_1.cc", - "gen/arm32_decode_actuals_2.cc", - ] - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/cpu_features:cpu_features", - ] - - configs += [ ":arm_validator_core_config" ] -} - -static_library("ncvalidate_arm_v2") { - sources = [ - "ncvalidate.cc", - ] - deps = [ - "//build/config/nacl:nacl_base", - ":arm_validator_core", - "//native_client/src/trusted/validator:validation_cache", - ] -} - -static_library("arm_validator_reporters") { - sources = [ - "problem_reporter.cc", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] -} diff --git a/src/trusted/validator_mips/BUILD.gn b/src/trusted/validator_mips/BUILD.gn deleted file mode 100644 index c4d127983f..0000000000 --- a/src/trusted/validator_mips/BUILD.gn +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2016 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -static_library("mips_validator_core") { - sources = [ - "address_set.cc", - "validator.cc", - "$target_gen_dir/decode.cc", - ] - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/cpu_features:cpu_features", - ":decode_gen" - ] -} - -action("decode_gen") { - script = "dgen/generate_decoder.py" - outputs = [ - "$target_gen_dir/decode.cc", - ] - sources = [ - "mips-opt.table", - ] - inputs = [ - "dgen/generate_decoder.py", - "dgen/dgen_core.py", - "dgen/dgen_input.py", - "dgen/dgen_opt.py", - "dgen/dgen_output.py", - ] - args = rebase_path(sources, root_build_dir) + - rebase_path(outputs, root_build_dir) -} - -static_library("ncvalidate_mips") { - sources = [ - "ncvalidate.cc", - ] - deps = [ - "//build/config/nacl:nacl_base", - ":mips_validator_core", - ] -} diff --git a/src/trusted/validator_ragel/BUILD.gn b/src/trusted/validator_ragel/BUILD.gn deleted file mode 100644 index 1752577304..0000000000 --- a/src/trusted/validator_ragel/BUILD.gn +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# These objects are included in both dfa_validate_x86_xx and rdfa_validator -# libraries, so we have to introduce intermediate scons nodes. -validator32 = "gen/validator_x86_32.c" -validator64 = "gen/validator_x86_64.c" - -config("dfa_validator_config") { - if (is_clang) { - # ragel output (validator_x86_32.c / validator_x86_64.c) has many many - # breaks right after gotos. - cflags = [ "-Wno-unreachable-code-break" ] - } -} - -if (current_cpu == "x86" || current_cpu == "x64") { - static_library("dfa_validate") { - sources = [ - "validator_features_all.c", - "validator_features_validator.c", - "dfa_validate_common.c", - ] - if (current_cpu == "x86") { - sources += [ - validator32, - "dfa_validate_32.c", - ] - } else { - sources += [ - validator64, - "dfa_validate_64.c", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/trusted/cpu_features:cpu_features", - "//native_client/src/trusted/validator:validation_cache", - "//native_client/src/trusted/validator_x86:nccopy", - ] - configs += [ ":dfa_validator_config" ] - } -} - -# Low-level platform-independent interface supporting both 32 and 64 bit, -# used in ncval and in validator_benchmark. -static_library("rdfa_validator") { - sources = [ - validator32, - validator64, - "validator_features_all.c", - "validator_features_validator.c", - ] - defines = [ "VALIDATOR_EXPORT=DLLEXPORT" ] - deps = [ - "//build/config/nacl:nacl_base", - ] - configs += [ ":dfa_validator_config" ] -} diff --git a/src/trusted/validator_x86/BUILD.gn b/src/trusted/validator_x86/BUILD.gn deleted file mode 100644 index ebfc56dca7..0000000000 --- a/src/trusted/validator_x86/BUILD.gn +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//native_client/src/trusted/asm.gni") - -if (current_cpu == "x86" || current_cpu == "x64") { - if (current_toolchain == nacl_asm_toolchain) { - source_set("nccopy_asm") { - sources = [ - "nccopycode_stores.S", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] - } - } - - source_set("nccopy") { - sources = [ - "nccopycode.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ":nccopy_asm($nacl_asm_toolchain)", - ] - } -} diff --git a/src/trusted/win/BUILD.gn b/src/trusted/win/BUILD.gn deleted file mode 100644 index 13a88a734c..0000000000 --- a/src/trusted/win/BUILD.gn +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (c) 2015 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/toolchain/toolchain.gni") - -# This is a special toolchain used solely for building GNU/AT&T-syntax -# assembly files on Windows. See src/trusted/asm.gni for more details. - -tool_wrapper_path = - rebase_path("//build/toolchain/win/tool_wrapper.py", root_build_dir) - -template("nacl_win_as_toolchain") { - toolchain(target_name) { - tool("asm") { - # For GCC we can just use the C compiler to compile assembly. - win_as_script = - rebase_path("//native_client/tools/win_as.py", root_build_dir) - clang_cl = rebase_path( - "//third_party/llvm-build/Release+Asserts/bin/clang-cl.exe", - root_build_dir) - if (invoker.toolchain_cpu == "x86") { - env = "environment.x86" - win_as_arch = "Win32" - } else { - env = "environment.x64" - win_as_arch = invoker.toolchain_cpu - } - top_srcdir = rebase_path("//", root_build_dir) - rspfile = "{{output}}.rsp" - rspfile_content = "\"$python_path\" $win_as_script -a $win_as_arch -p $top_srcdir -c $clang_cl -o {{output}} {{source}}" - command = "$python_path $tool_wrapper_path action-wrapper $env $rspfile" - depsformat = "msvc" - description = "GNU ASM {{output}}" - outputs = [ - "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj", - ] - } - - # These two are really entirely generic, but have to be repeated in - # each toolchain because GN doesn't allow a template to be used here. - # See //build/toolchain/toolchain.gni for details. - tool("stamp") { - command = stamp_command - description = stamp_description - } - tool("copy") { - command = copy_command - description = copy_description - } - - # This is necessary so that certain .gn files with static_libraries (e.g. - # //build/config/sanitizers/BUILD.gn) can be loaded in the context of this - # toolchain. - tool("alink") { - command = "fake" - outputs = [ "fake" ] - } - - toolchain_args = { - current_os = "win" - current_cpu = invoker.toolchain_cpu - - # These values need to be passed through unchanged. - host_toolchain = host_toolchain - target_os = target_os - target_cpu = target_cpu - } - } -} - -nacl_win_as_toolchain("nacl_win_as_x86") { - toolchain_cpu = "x86" -} - -nacl_win_as_toolchain("nacl_win_as_x64") { - toolchain_cpu = "x64" -} diff --git a/src/untrusted/DEPS b/src/untrusted/DEPS deleted file mode 100644 index b9d27310a6..0000000000 --- a/src/untrusted/DEPS +++ /dev/null @@ -1,12 +0,0 @@ -include_rules = [ - "+native_client/src/public", - "+native_client/src/shared", - "+native_client/src/untrusted", - "+native_client/src/third_party/dlmalloc", - "+native_client/src/third_party/valgrind", - # For nacl/syscall_bindings_trampoline.h and a couple of tests: - "+native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h", - "+native_client/src/trusted/service_runtime/nacl_config.h", - # For various tests: - "+native_client/src/trusted/service_runtime/include/sys", -] diff --git a/src/untrusted/elf_loader/BUILD.gn b/src/untrusted/elf_loader/BUILD.gn deleted file mode 100644 index f922d2324e..0000000000 --- a/src/untrusted/elf_loader/BUILD.gn +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2015 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -assert(current_os == "nacl", "This file contains untrusted code only.") - -import("//build/config/nacl/config.gni") - -if (current_cpu != "pnacl" && !is_nacl_glibc) { - executable("elf_loader") { - sources = [ - "elf_loader.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - ] - } -} - -if (is_nacl_glibc) { - # The elf_loader nexe can only be built with the newlib toolchain, - # but it's needed for things built in the glibc toolchain. To - # keep things simpler for users of it, copy it into the glibc - # $root_out_dir and give it the name used in GYP (and expected by - # the SDK's create_nmf.py): elf_loader_.nexe. - copy("elf_loader") { - here = get_label_info(".", "dir") - newlib_tc = "//build/toolchain/nacl:clang_newlib_" + current_cpu - elf_loader_label = here + ":elf_loader" + "(" + newlib_tc + ")" - newlib_out_dir = get_label_info(elf_loader_label, "root_out_dir") - deps = [ - elf_loader_label, - ] - sources = [ - newlib_out_dir + "/elf_loader.nexe", - ] - outputs = [ - "$root_out_dir/elf_loader_" + current_cpu + ".nexe", - ] - } -} diff --git a/src/untrusted/irt/BUILD.gn b/src/untrusted/irt/BUILD.gn deleted file mode 100644 index 2eeff6af22..0000000000 --- a/src/untrusted/irt/BUILD.gn +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -executable("irt_core") { - cflags_c = [ "-std=gnu99" ] - - sources = [ - "irt_core_resource.c", - "irt_entry_core.c", - "irt_pnacl_translator_common.c", - "irt_pnacl_translator_compile.c", - "irt_pnacl_translator_link.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ":irt_core_lib", - ] - - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} - -static_library("irt_core_lib") { - cflags_c = [ "-std=c99" ] - if (defined(is_nacl_saigo) && is_nacl_saigo) { - cflags_c += [ - "-Wextra", - "-Wno-unused-parameter", - ] - } - - sources = [ - "../../untrusted/pthread/nc_condvar.c", - "../../untrusted/pthread/nc_mutex.c", - "../../untrusted/nacl/sys_private.c", - "../../untrusted/valgrind/dynamic_annotations.c", - "irt_basic.c", - "irt_blockhook.c", - "irt_clock.c", - "irt_code_data_alloc.c", - "irt_cond.c", - "irt_dev_getpid.c", - "irt_dev_list_mappings.c", - "irt_dyncode.c", - "irt_entry.c", - "irt_exception_handling.c", - "irt_fdio.c", - "irt_filename.c", - "irt_futex.c", - "irt_interfaces.c", - "irt_malloc.c", - "irt_memory.c", - "irt_mutex.c", - "irt_private_pthread.c", - "irt_private_tls.c", - "irt_query_list.c", - "irt_random.c", - "irt_sem.c", - "irt_thread.c", - "irt_tls.c", - ] - - deps = [ - "//build/config/nacl:nacl_base", - "//native_client/src/shared/gio:gio", - "//native_client/src/shared/platform:platform", - "//native_client/src/untrusted/nacl:imc_syscalls", - ] -} diff --git a/src/untrusted/minidump_generator/DEPS b/src/untrusted/minidump_generator/DEPS deleted file mode 100644 index 7e9979025a..0000000000 --- a/src/untrusted/minidump_generator/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+breakpad/src", -] diff --git a/src/untrusted/nacl/BUILD.gn b/src/untrusted/nacl/BUILD.gn deleted file mode 100644 index ff5dbfdffd..0000000000 --- a/src/untrusted/nacl/BUILD.gn +++ /dev/null @@ -1,427 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -assert(current_os == "nacl", "This file contains untrusted code only.") - -static_library("nacl_dyncode_private") { - cflags_c = [] - sources = [ - "dyncode_private.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_sys_private") { - cflags_c = [] - sources = [ - "null.c", - "sysbrk.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("imc_syscalls") { - cflags_c = [] - sources = [ - "imc_accept.c", - "imc_connect.c", - "imc_makeboundsock.c", - "imc_mem_obj_create.c", - "imc_recvmsg.c", - "imc_sendmsg.c", - "imc_socketpair.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_exception_private") { - cflags_c = [] - sources = [ - "nacl_exception_private.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_list_mappings_private") { - cflags_c = [] - sources = [ - "list_mappings_private.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_dyncode") { - cflags_c = [] - sources = [ - "dyncode.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl") { - cflags_c = [ "-std=c99" ] - sources = [ - "gc_hooks.c", - "nacl_irt.c", - "nacl_irt_init.c", - "nacl_random.c", - "nacl_tls_get.c", - "nacl_tls_init.c", - ] - - if (current_os != "glibc") { - sources += [ - "_exit.c", - "abort.c", - "access.c", - "chdir.c", - "chmod.c", - "clock.c", - "clock_getres.c", - "clock_gettime.c", - "close.c", - "dup.c", - "eaccess.c", - "fchdir.c", - "fchmod.c", - "fdatasync.c", - "fstat.c", - "fsync.c", - "ftruncate.c", - "getcwd.c", - "getcwd_without_malloc.c", - "getdents.c", - "gethostname.c", - "getpagesize.c", - "getpid.c", - "gettimeofday.c", - "htonl.c", - "htons.c", - "isatty.c", - "link.c", - "lock.c", - "lseek.c", - "lstat.c", - "malloc.c", - "mkdir.c", - "mmap.c", - "mprotect.c", - "munmap.c", - "nacl_add_tp.c", - "nacl_ext_supply.c", - "nacl_interface_query.c", - "nacl_irt_fdio.c", - "nacl_irt_filename.c", - "nacl_read_tp.c", - "nanosleep.c", - "ntohl.c", - "ntohs.c", - "open.c", - "pthread_initialize_minimal.c", - "pthread_stubs.c", - "random.c", - "read.c", - "readlink.c", - "rename.c", - "rmdir.c", - "sbrk.c", - "sched_yield.c", - "sigblock.c", - "siggetmask.c", - "sigmask.c", - "sigprocmask.c", - "sigsetmask.c", - "srandom.c", - "stacktrace.c", - "start.c", - "stat.c", - "stubs/_execve.c", - "stubs/accept.c", - "stubs/addmntent.c", - "stubs/bind.c", - "stubs/chown.c", - "stubs/closelog.c", - "stubs/connect.c", - "stubs/endgrent.c", - "stubs/endmntent.c", - "stubs/endpwent.c", - "stubs/environ.c", - "stubs/execvpe.c", - "stubs/fchown.c", - "stubs/fcntl.c", - "stubs/fork.c", - "stubs/freeaddrinfo.c", - "stubs/fstatvfs.c", - "stubs/gai_strerror.c", - "stubs/get_current_dir_name.c", - "stubs/getaddrinfo.c", - "stubs/getdtablesize.c", - "stubs/getegid.c", - "stubs/geteuid.c", - "stubs/getgid.c", - "stubs/getgrent.c", - "stubs/getgrgid.c", - "stubs/getgrgid_r.c", - "stubs/getgrnam.c", - "stubs/getgroups.c", - "stubs/gethostbyaddr.c", - "stubs/gethostbyname.c", - "stubs/getlogin.c", - "stubs/getmntent.c", - "stubs/getnameinfo.c", - "stubs/getpeername.c", - "stubs/getpgrp.c", - "stubs/getppid.c", - "stubs/getpwent.c", - "stubs/getpwnam.c", - "stubs/getpwnam_r.c", - "stubs/getpwuid.c", - "stubs/getpwuid_r.c", - "stubs/getrlimit.c", - "stubs/getrusage.c", - "stubs/getservbyname.c", - "stubs/getservbyport.c", - "stubs/getsockname.c", - "stubs/getsockopt.c", - "stubs/getuid.c", - "stubs/getwd.c", - "stubs/hasmntopt.c", - "stubs/if_freenameindex.c", - "stubs/if_indextoname.c", - "stubs/if_nameindex.c", - "stubs/if_nametoindex.c", - "stubs/inet_ntoa.c", - "stubs/inet_ntop.c", - "stubs/initgroups.c", - "stubs/ioctl.c", - "stubs/issetugid.c", - "stubs/kill.c", - "stubs/lchown.c", - "stubs/listen.c", - "stubs/llseek.c", - "stubs/major.c", - "stubs/makedev.c", - "stubs/minor.c", - "stubs/mkfifo.c", - "stubs/mknod.c", - "stubs/msync.c", - "stubs/openlog.c", - "stubs/pipe.c", - "stubs/poll.c", - "stubs/pselect.c", - "stubs/pthread_sigmask.c", - "stubs/readv.c", - "stubs/recv.c", - "stubs/recvfrom.c", - "stubs/recvmsg.c", - "stubs/sched_get_priority_max.c", - "stubs/sched_get_priority_min.c", - "stubs/sched_setparam.c", - "stubs/sched_setscheduler.c", - "stubs/select.c", - "stubs/send.c", - "stubs/sendmsg.c", - "stubs/sendto.c", - "stubs/setegid.c", - "stubs/seteuid.c", - "stubs/setgid.c", - "stubs/setgrent.c", - "stubs/setgroups.c", - "stubs/setmntent.c", - "stubs/setpgid.c", - "stubs/setpwent.c", - "stubs/setrlimit.c", - "stubs/setsid.c", - "stubs/setsockopt.c", - "stubs/settimeofday.c", - "stubs/setuid.c", - "stubs/shutdown.c", - "stubs/sigaction.c", - "stubs/signal.c", - "stubs/sigsuspend.c", - "stubs/sigvec.c", - "stubs/socket.c", - "stubs/socketpair.c", - "stubs/statvfs.c", - "stubs/syslog.c", - "stubs/tcdrain.c", - "stubs/tcflow.c", - "stubs/tcflush.c", - "stubs/tcgetattr.c", - "stubs/tcsendbreak.c", - "stubs/tcsetattr.c", - "stubs/times.c", - "stubs/ttyname.c", - "stubs/ttyname_r.c", - "stubs/umask.c", - "stubs/vfork.c", - "stubs/wait.c", - "stubs/waitpid.c", - "symlink.c", - "sysconf.c", - "tls.c", - "truncate.c", - "uname.c", - "unlink.c", - "utime.c", - "utimes.c", - "write.c", - ] - } - - if (current_os != "glibc" && current_cpu == "arm") { - sources += [ "aeabi_read_tp.S" ] - } - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] -} - -source_set("irt_random") { - cflags_c = [] - sources = [ - "../../untrusted/irt/irt_random.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_exception") { - cflags_c = [] - sources = [ - "nacl_exception.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] -} -static_library("nacl_list_mappings") { - cflags_c = [] - sources = [ - "list_mappings.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] -} - -if (current_os != "glibc") { - source_set("sys_private") { - cflags_c = [] - sources = [ - "sys_private.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] - } - source_set("gc_hooks_private") { - cflags_c = [] - sources = [ - "gc_hooks_private.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - deps = [ - "//build/config/nacl:nacl_base", - ] - } - source_set("private_blockhook") { - cflags_c = [] - sources = [ - "../../untrusted/irt/irt_blockhook.c", - ] - - if (current_cpu == "pnacl") { - cflags_c += [ - "-Wno-self-assign", - ] - } - - deps = [ - "//build/config/nacl:nacl_base", - ] - } -} diff --git a/src/untrusted/pthread/BUILD.gn b/src/untrusted/pthread/BUILD.gn deleted file mode 100644 index 013f129db6..0000000000 --- a/src/untrusted/pthread/BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014 The Native ClientAuthors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -static_library("pthread") { - cflags_c = [ "-std=c99" ] - sources = [ - "nc_thread.c", - "nc_mutex.c", - "nc_condvar.c", - "nc_rwlock.c", - "nc_semaphore.c", - "nc_init_irt.c", - "stack_end.c", - "../valgrind/dynamic_annotations.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] -} diff --git a/tests/BUILD.gn b/tests/BUILD.gn deleted file mode 100644 index 15017314e7..0000000000 --- a/tests/BUILD.gn +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2016 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//native_client/tests/test.gni") - -source_set("test_utils") { - testonly = true - sources = [ - "test_runner.cc", - ] - deps = [ - "//native_client/src/third_party/gtest", - ] -} - -test("small_tests") { - deps = [ - ":test_utils", - ] - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} - -test("medium_tests") { - deps = [ - ":test_utils", - ] - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} - -test("large_tests") { - deps = [ - ":test_utils", - ] - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} diff --git a/tests/DEPS b/tests/DEPS deleted file mode 100644 index 449c648754..0000000000 --- a/tests/DEPS +++ /dev/null @@ -1,9 +0,0 @@ -include_rules = [ - "+native_client/src/nonsfi/linux", - "+native_client/src/public", - "+native_client/src/shared", - "+native_client/src/third_party/valgrind", - "+native_client/src/trusted", - "+native_client/src/untrusted", - "+native_client/tests", -] diff --git a/tests/callingconv_ppapi/DEPS b/tests/callingconv_ppapi/DEPS deleted file mode 100644 index 74feb2d772..0000000000 --- a/tests/callingconv_ppapi/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+ppapi/c" -] diff --git a/tests/hello_world/BUILD.gn b/tests/hello_world/BUILD.gn deleted file mode 100644 index 7fdd5222d1..0000000000 --- a/tests/hello_world/BUILD.gn +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2014 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -executable("hello_world") { - sources = [ - "hello_world.c", - ] - deps = [ - "//build/config/nacl:nacl_base", - ] - - # TODO(fabiansommer): Remove with next build deps roll - if (is_linux && current_cpu == "x86") { - ldflags = [ "-static-libstdc++" ] - } -} diff --git a/toolchain_build/toolchain_build_pnacl.py b/toolchain_build/toolchain_build_pnacl.py index edb622eb80..091c7928bd 100755 --- a/toolchain_build/toolchain_build_pnacl.py +++ b/toolchain_build/toolchain_build_pnacl.py @@ -196,7 +196,7 @@ def MacSdkFlags(): return [] mac_sdk_sysroot, mac_sdk_version = subprocess.check_output([ sys.executable, - os.path.join(os.path.dirname(NACL_DIR), 'build', 'mac', 'find_sdk.py'), + os.path.join(os.path.dirname(NACL_DIR), 'tools', 'build', 'mac', 'find_sdk.py'), '--print_sdk_path', MAC_SDK_MIN, ], encoding='utf-8').splitlines() diff --git a/tools/DEPS b/tools/DEPS deleted file mode 100644 index 2d4b2f999e..0000000000 --- a/tools/DEPS +++ /dev/null @@ -1,5 +0,0 @@ -skip_child_includes = [ - "SRC", - "BUILD", - "BACKPORTS", -] diff --git a/build/build_nexe_tools.py b/tools/build/build_nexe_tools.py similarity index 100% rename from build/build_nexe_tools.py rename to tools/build/build_nexe_tools.py diff --git a/build/cygtar.py b/tools/build/cygtar.py similarity index 100% rename from build/cygtar.py rename to tools/build/cygtar.py diff --git a/build/filter_windows_lcov.py b/tools/build/filter_windows_lcov.py similarity index 100% rename from build/filter_windows_lcov.py rename to tools/build/filter_windows_lcov.py diff --git a/build/get_toolchain_revision.py b/tools/build/get_toolchain_revision.py similarity index 100% rename from build/get_toolchain_revision.py rename to tools/build/get_toolchain_revision.py diff --git a/build/link_irt.py b/tools/build/link_irt.py similarity index 100% rename from build/link_irt.py rename to tools/build/link_irt.py diff --git a/build/mac/find_sdk.py b/tools/build/mac/find_sdk.py similarity index 100% rename from build/mac/find_sdk.py rename to tools/build/mac/find_sdk.py diff --git a/build/mac/strip_from_xcode b/tools/build/mac/strip_from_xcode similarity index 97% rename from build/mac/strip_from_xcode rename to tools/build/mac/strip_from_xcode index c26b9fb492..33ec72b0e5 100755 --- a/build/mac/strip_from_xcode +++ b/tools/build/mac/strip_from_xcode @@ -12,7 +12,7 @@ # # An example "Strip If Needed" build phase placed after "Link Binary With # Libraries" would do: -# exec "${XCODEPROJ_DEPTH}/build/mac/strip_from_xcode" +# exec "${XCODEPROJ_DEPTH}/tools/build/mac/strip_from_xcode" if [ "${CONFIGURATION}" != "Release" ] ; then # Only strip in release mode. diff --git a/build/mac/strip_save_dsym b/tools/build/mac/strip_save_dsym similarity index 100% rename from build/mac/strip_save_dsym rename to tools/build/mac/strip_save_dsym diff --git a/build/package_version/archive_info.py b/tools/build/package_version/archive_info.py similarity index 100% rename from build/package_version/archive_info.py rename to tools/build/package_version/archive_info.py diff --git a/build/package_version/archive_info_test.py b/tools/build/package_version/archive_info_test.py similarity index 100% rename from build/package_version/archive_info_test.py rename to tools/build/package_version/archive_info_test.py diff --git a/build/package_version/build.scons b/tools/build/package_version/build.scons similarity index 100% rename from build/package_version/build.scons rename to tools/build/package_version/build.scons diff --git a/build/package_version/error.py b/tools/build/package_version/error.py similarity index 100% rename from build/package_version/error.py rename to tools/build/package_version/error.py diff --git a/build/package_version/package_info.py b/tools/build/package_version/package_info.py similarity index 100% rename from build/package_version/package_info.py rename to tools/build/package_version/package_info.py diff --git a/build/package_version/package_info_test.py b/tools/build/package_version/package_info_test.py similarity index 100% rename from build/package_version/package_info_test.py rename to tools/build/package_version/package_info_test.py diff --git a/build/package_version/package_locations.py b/tools/build/package_version/package_locations.py similarity index 100% rename from build/package_version/package_locations.py rename to tools/build/package_version/package_locations.py diff --git a/build/package_version/package_version.py b/tools/build/package_version/package_version.py similarity index 99% rename from build/package_version/package_version.py rename to tools/build/package_version/package_version.py index eba8918762..615b724166 100755 --- a/build/package_version/package_version.py +++ b/tools/build/package_version/package_version.py @@ -24,7 +24,7 @@ Packages File - A file which describes the various package targets for each platform/architecture along with the packages associated with each package target. - [Default file: build/package_version/standard_packages.json]. + [Default file: tools/build/package_version/standard_packages.json]. Package File - A file which contains the list of package archives within a package. [Default file: toolchain/.tars/$PACKAGE_TARGET/$PACKAGE.json] diff --git a/build/package_version/package_version_test.py b/tools/build/package_version/package_version_test.py similarity index 100% rename from build/package_version/package_version_test.py rename to tools/build/package_version/package_version_test.py diff --git a/build/package_version/packages_info.py b/tools/build/package_version/packages_info.py similarity index 100% rename from build/package_version/packages_info.py rename to tools/build/package_version/packages_info.py diff --git a/build/package_version/packages_info_test.py b/tools/build/package_version/packages_info_test.py similarity index 100% rename from build/package_version/packages_info_test.py rename to tools/build/package_version/packages_info_test.py diff --git a/build/package_version/revision_info.py b/tools/build/package_version/revision_info.py similarity index 100% rename from build/package_version/revision_info.py rename to tools/build/package_version/revision_info.py diff --git a/build/package_version/revision_info_test.py b/tools/build/package_version/revision_info_test.py similarity index 100% rename from build/package_version/revision_info_test.py rename to tools/build/package_version/revision_info_test.py diff --git a/build/package_version/run_package_version_tests.py b/tools/build/package_version/run_package_version_tests.py similarity index 100% rename from build/package_version/run_package_version_tests.py rename to tools/build/package_version/run_package_version_tests.py diff --git a/build/package_version/standard_packages.json b/tools/build/package_version/standard_packages.json similarity index 100% rename from build/package_version/standard_packages.json rename to tools/build/package_version/standard_packages.json diff --git a/build/package_version/test_packages.json b/tools/build/package_version/test_packages.json similarity index 100% rename from build/package_version/test_packages.json rename to tools/build/package_version/test_packages.json diff --git a/build/toolchain_vs2013.hash b/tools/build/toolchain_vs2013.hash similarity index 100% rename from build/toolchain_vs2013.hash rename to tools/build/toolchain_vs2013.hash diff --git a/build/update_pnacl_tool_revisions.py b/tools/build/update_pnacl_tool_revisions.py similarity index 100% rename from build/update_pnacl_tool_revisions.py rename to tools/build/update_pnacl_tool_revisions.py diff --git a/tools/checkdeps/DEPS b/tools/checkdeps/DEPS deleted file mode 100644 index 7a57b0bcc8..0000000000 --- a/tools/checkdeps/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -skip_child_includes = [ - "testdata", -] diff --git a/tools/redirector/DEPS b/tools/redirector/DEPS deleted file mode 100644 index 030229b345..0000000000 --- a/tools/redirector/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+native_client/tools/redirector" -] diff --git a/tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.sh b/tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.sh index fad156e500..2bbea6ba9d 100755 --- a/tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.sh +++ b/tools/trusted_cross_toolchains/trusted-toolchain-creator.armhf.sh @@ -349,7 +349,7 @@ UploadArchive() { URL=https://storage.googleapis.com/${GS_FILE} set -x gsutil cp -a public-read ${TAR_ARCHIVE} gs://${GS_FILE} - local package_version=build/package_version/package_version.py + local package_version=tools/build/package_version/package_version.py ${package_version} archive --archive-package arm_trusted ${TAR_ARCHIVE}@${URL} ${package_version} upload --upload-package arm_trusted --revision ${REV} ${package_version} setrevision --revision-package arm_trusted --revision \ diff --git a/tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.debian.sh b/tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.debian.sh index eefd83e4ae..672edeeaa6 100755 --- a/tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.debian.sh +++ b/tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.debian.sh @@ -555,7 +555,7 @@ UploadArchive() { local URL=https://storage.googleapis.com/${GS_FILE} set -x gsutil cp -a public-read ${TAR_ARCHIVE} gs://${GS_FILE} - local package_version=build/package_version/package_version.py + local package_version=tools/build/package_version/package_version.py ${package_version} archive --archive-package linux_x86/mips_trusted \ ${TAR_ARCHIVE}@${URL} ${package_version} upload --upload-package linux_x86/mips_trusted \