Skip to content

Commit

Permalink
Revert "Roll to mojo/public @ 672a0b6386e3d15615928a22ce9df7da8395f253 (
Browse files Browse the repository at this point in the history
flutter#3063)" (flutter#3066)

This reverts commit cfc2b0c.

The include paths for GL headers in mojo/public are busted
  • Loading branch information
jamesr authored Sep 27, 2016
1 parent e105e69 commit 4014a5b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ vars = {
'chromium_git': 'https://chromium.googlesource.com',
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'mojo_sdk_revision': '672a0b6386e3d15615928a22ce9df7da8395f253',
'mojo_sdk_revision': '6b5fb1227c742f5ecc077486ebc029f2711c61fa',
'base_revision': '672b04e54b937ec899429a6bd5409c5a6300d151',
'skia_revision': '5561e3ddbbf6c3e051075ada4a11ddc70760f03d',

Expand All @@ -45,7 +45,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '79ef956051698e3843e87c781112bfd9cc3695f0',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '2f656511ecc11565bd975b0f0ac7aa7383950132',

# Fuchsia compatibility
#
Expand Down
2 changes: 0 additions & 2 deletions sky/engine/web/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ source_set("web") {
deps = [
"//flutter/sky/engine/core",
"//flutter/sky/engine/platform",
"//mojo/public/c",
]

configs += [
Expand All @@ -26,7 +25,6 @@ source_set("web") {
} else {
deps += [
"//mojo/message_pump",
"//mojo/public/c:gpu",
]
}
}
2 changes: 1 addition & 1 deletion sky/engine/wtf/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ executable("unittests") {
# will be injected at runtime so the link succeeds.
deps += [
"//mojo/public/cpp/environment:standalone",
"//mojo/public/platform/native:system_thunks",
"//mojo/public/platform/native:system",
]
}
}

0 comments on commit 4014a5b

Please sign in to comment.