Skip to content

Commit

Permalink
Merge pull request #33 from supervacuus/meta/update-handler
Browse files Browse the repository at this point in the history
meta: update handler 2022-12-12
  • Loading branch information
Swatinem authored Dec 16, 2022
2 parents e406f0b + 8ad645f commit 53abd91
Show file tree
Hide file tree
Showing 49 changed files with 2,657 additions and 5,765 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ config.h
/Makefile
stamp-h1

# Ignore GYP generated Visual Studio artifacts.
# Ignore generated Visual Studio artifacts.
*.filters
*.sdf
*.sln
*.suo
*.vcproj
*.vcxproj

# Ignore GYP generated Makefiles
# Ignore generated Makefiles
src/Makefile
*.Makefile
*.target.mk
Expand All @@ -89,4 +89,3 @@ src/Makefile
src/testing
src/third_party/lss
src/third_party/protobuf
src/tools/gyp
28 changes: 1 addition & 27 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,10 @@ deps = {
"https://github.com/google/protobuf.git" +
"@cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac",

# GYP project generator.
"src/src/tools/gyp":
"https://chromium.googlesource.com/external/gyp/" +
"@324dd166b7c0b39d513026fa52d6280ac6d56770",

# Linux syscall support.
"src/src/third_party/lss":
"https://chromium.googlesource.com/linux-syscall-support/" +
"@ce877209e11aa69dcfffbd53ef90ea1d07136521",
"@9719c1e1e676814c456b55f5f070eabad6709d31",
}

hooks = [
Expand All @@ -61,24 +56,3 @@ hooks = [
"src/DEPS", "src/default.xml"],
},
]

hooks_os = {
'win': [
{
# TODO(chrisha): Fix the GYP files so that they work without
# --no-circular-check.
"pattern": ".",
"action": ["python",
"src/src/tools/gyp/gyp_main.py",
"--no-circular-check",
"src/src/client/windows/breakpad_client.gyp"],
},
{
# XXX: this and above should all be wired into build/all.gyp ?
"action": ["python",
"src/src/tools/gyp/gyp_main.py",
"--no-circular-check",
"src/src/tools/windows/tools_windows.gyp"],
},
],
}
Loading

0 comments on commit 53abd91

Please sign in to comment.