154 lines
4.9 KiB
Diff
154 lines
4.9 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Thu, 20 Apr 2017 16:25:49 +0200
|
|
Subject: build: remove calling untrusted hooks
|
|
|
|
Avoid downloading untrusted executables and wasting time with a
|
|
sysroot.
|
|
---
|
|
DEPS | 96 ++----------------------------------------------------------
|
|
1 file changed, 3 insertions(+), 93 deletions(-)
|
|
|
|
diff --git a/DEPS b/DEPS
|
|
--- a/DEPS
|
|
+++ b/DEPS
|
|
@@ -85,7 +85,7 @@ vars = {
|
|
|
|
# Check out and download nacl by default. This can be disabled e.g. with
|
|
# custom_vars.
|
|
- 'checkout_nacl': True,
|
|
+ 'checkout_nacl': False,
|
|
|
|
# By default, do not check out src-internal. This can be overridden e.g. with
|
|
# custom_vars.
|
|
@@ -112,8 +112,8 @@ vars = {
|
|
# support for other platforms may be added in the future.
|
|
'checkout_openxr' : 'checkout_win',
|
|
|
|
- 'checkout_traffic_annotation_tools': 'checkout_configuration != "small"',
|
|
- 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration != "small"',
|
|
+ 'checkout_traffic_annotation_tools': False,
|
|
+ 'checkout_instrumented_libraries': False,
|
|
|
|
# By default, do not check out WebKit for iOS, as it is not needed unless
|
|
# running against ToT WebKit rather than system WebKit. This can be overridden
|
|
@@ -3609,49 +3609,6 @@ hooks = [
|
|
'sync', '--extract',
|
|
],
|
|
},
|
|
- {
|
|
- 'name': 'sysroot_arm',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and checkout_arm',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=arm'],
|
|
- },
|
|
- {
|
|
- 'name': 'sysroot_arm64',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and checkout_arm64',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=arm64'],
|
|
- },
|
|
- {
|
|
- 'name': 'sysroot_x86',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=x86'],
|
|
- },
|
|
- {
|
|
- 'name': 'sysroot_mips',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and checkout_mips',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=mips'],
|
|
- },
|
|
- {
|
|
- 'name': 'sysroot_mips64',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and checkout_mips64',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=mips64el'],
|
|
- },
|
|
-
|
|
- {
|
|
- 'name': 'sysroot_x64',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_linux and checkout_x64',
|
|
- 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
|
|
- '--arch=x64'],
|
|
- },
|
|
{
|
|
# Case-insensitivity for the Win SDK. Must run before win_toolchain below.
|
|
'name': 'ciopfs_linux',
|
|
@@ -3679,18 +3636,6 @@ hooks = [
|
|
'condition': 'checkout_mac',
|
|
'action': ['python', 'src/build/mac_toolchain.py'],
|
|
},
|
|
- # Pull binutils for linux, enabled debug fission for faster linking /
|
|
- # debugging when used with clang on Ubuntu Precise.
|
|
- # https://code.google.com/p/chromium/issues/detail?id=352046
|
|
- {
|
|
- 'name': 'binutils',
|
|
- 'pattern': 'src/third_party/binutils',
|
|
- 'condition': 'host_os == "linux" and host_cpu != "mips64"',
|
|
- 'action': [
|
|
- 'python',
|
|
- 'src/third_party/binutils/download.py',
|
|
- ],
|
|
- },
|
|
{
|
|
# Update the prebuilt clang toolchain.
|
|
# Note: On Win, this should run after win_toolchain, as it may use it.
|
|
@@ -3786,18 +3731,6 @@ hooks = [
|
|
'-s', 'src/buildtools/mac/clang-format.sha1',
|
|
],
|
|
},
|
|
- {
|
|
- 'name': 'clang_format_linux',
|
|
- 'pattern': '.',
|
|
- 'condition': 'host_os == "linux"',
|
|
- 'action': [ 'python',
|
|
- 'src/third_party/depot_tools/download_from_google_storage.py',
|
|
- '--no_resume',
|
|
- '--no_auth',
|
|
- '--bucket', 'chromium-clang-format',
|
|
- '-s', 'src/buildtools/linux64/clang-format.sha1',
|
|
- ],
|
|
- },
|
|
# Pull rc binaries using checked-in hashes.
|
|
{
|
|
'name': 'rc_win',
|
|
@@ -3823,29 +3756,6 @@ hooks = [
|
|
'-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
|
|
],
|
|
},
|
|
- {
|
|
- 'name': 'rc_linux',
|
|
- 'pattern': '.',
|
|
- 'condition': 'checkout_win and host_os == "linux"',
|
|
- 'action': [ 'python',
|
|
- 'src/third_party/depot_tools/download_from_google_storage.py',
|
|
- '--no_resume',
|
|
- '--no_auth',
|
|
- '--bucket', 'chromium-browser-clang/rc',
|
|
- '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1',
|
|
- ]
|
|
- },
|
|
- {
|
|
- 'name': 'test_fonts',
|
|
- 'pattern': '.',
|
|
- 'action': [ 'download_from_google_storage',
|
|
- '--no_resume',
|
|
- '--extract',
|
|
- '--no_auth',
|
|
- '--bucket', 'chromium-fonts',
|
|
- '-s', 'src/third_party/test_fonts/test_fonts.tar.gz.sha1',
|
|
- ],
|
|
- },
|
|
# Download test resources for opus, i.e. audio files.
|
|
{
|
|
'name': 'opus_test_files',
|
|
--
|
|
2.17.1
|
|
|