Skip to content

Commit

Permalink
build: remove sccache (#26701)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Nov 29, 2020
1 parent 8311ea1 commit 7cc5718
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 187 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Expand Up @@ -445,9 +445,6 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
# Fix Clang Install (wrong binary)
rm -rf src/third_party/llvm-build
python src/tools/clang/scripts/update.py
# Fix Framework Header Installs (symlinks not retained)
rm -rf src/electron/external_binaries
python src/electron/script/update-external-binaries.py
fi
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
Expand Down
13 changes: 0 additions & 13 deletions DEPS
Expand Up @@ -58,10 +58,6 @@ vars = {
# To allow running hooks without parsing the DEPS tree
'process_deps': True,

# It is always needed for normal Electron builds,
# but might be impossible for custom in-house builds.
'download_external_binaries': True,

'checkout_nacl':
False,
'checkout_libaom':
Expand Down Expand Up @@ -157,15 +153,6 @@ hooks = [
'src/electron/patches/mtime-cache.json',
],
},
{
'name': 'electron_external_binaries',
'pattern': 'src/electron/script/update-external-binaries.py',
'condition': 'download_external_binaries',
'action': [
'python3',
'src/electron/script/update-external-binaries.py',
],
},
{
'name': 'electron_npm_deps',
'pattern': 'src/electron/package.json',
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Expand Up @@ -98,8 +98,6 @@ build_script:
$env:SAVE_GCLIENT_SRC="true"
}
} else {
# update external binaries
python src/electron/script/update-external-binaries.py
# update angle
cd src\third_party\angle
git remote set-url origin https://chromium.googlesource.com/angle/angle.git
Expand Down
8 changes: 0 additions & 8 deletions docs/development/build-instructions-gn.md
Expand Up @@ -86,8 +86,6 @@ $ gclient sync -f
```sh
$ cd src
$ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
# this next line is needed only if building with sccache
$ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
```

Expand Down Expand Up @@ -141,12 +139,6 @@ This will build all of what was previously 'libchromiumcontent' (i.e. the
`content/` directory of `chromium` and its dependencies, incl. WebKit and V8),
so it will take a while.

To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
`cc_wrapper = "sccache"` by running `gn args out/Testing` to bring up an
editor and adding a line to the end of the file.

[sccache]: https://github.com/mozilla/sccache

The built executable will be under `./out/Testing`:

```sh
Expand Down
20 changes: 0 additions & 20 deletions script/external-binaries.json

This file was deleted.

1 change: 0 additions & 1 deletion script/generate-deps-hash.js
Expand Up @@ -9,7 +9,6 @@ const HASH_VERSION = 3;
const filesToHash = [
path.resolve(__dirname, '../DEPS'),
path.resolve(__dirname, '../yarn.lock'),
path.resolve(__dirname, '../script/external-binaries.json'),
path.resolve(__dirname, '../script/sysroots.json')
];

Expand Down
140 changes: 0 additions & 140 deletions script/update-external-binaries.py

This file was deleted.

0 comments on commit 7cc5718

Please sign in to comment.