Skip to content

Commit

Permalink
Remove target-os specific gclient dependencies. (flutter#4374)
Browse files Browse the repository at this point in the history
As we anyway always recommend to set the target_os to android.
Also if you happen to not set the target_os to android it messes up the licenses script output.
  • Loading branch information
amirh authored Nov 22, 2017
1 parent 93b2179 commit 1fa9917
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ solutions = [
"safesync_url": "",
},
]
target_os = ["android"]
```

* `cd engine` (Change to the directory in which you put the `.gclient` file.)
Expand Down
17 changes: 6 additions & 11 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,12 @@ deps = {
'src/third_party/dart/third_party/pkg/yaml':
Var('chromium_git') + '/external/github.com/dart-lang/yaml' + '@' + Var('dart_yaml_tag'),

'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',

'src/third_party/freetype2':
Var('fuchsia_git') + '/third_party/freetype2' + '@' + 'e23a030e9b43c648249477fdf7bf5305d2cc8f59',

'src/third_party/root_certificates':
Var('chromium_git') + '/external/github.com/dart-lang/root_certificates' + '@' + Var('dart_root_certificates_rev'),

Expand Down Expand Up @@ -373,17 +379,6 @@ recursedeps = [
'src/buildtools',
]

deps_os = {
'android': {
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',

'src/third_party/freetype2':
Var('fuchsia_git') + '/third_party/freetype2' + '@' + 'e23a030e9b43c648249477fdf7bf5305d2cc8f59',
},
}


hooks = [
{
# This clobbers when necessary (based on get_landmines.py). It must be the
Expand Down

0 comments on commit 1fa9917

Please sign in to comment.