From b312bb153ff19e4d3693fcfaf8d7b87fcc28fea1 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Thu, 17 Nov 2016 16:24:44 -0800 Subject: [PATCH] Remove mojo/public from DEPS and update buildroot. (flutter/engine#3240) --- DEPS | 6 +----- engine/src/flutter/sky/packages/sky_engine/BUILD.gn | 2 +- engine/src/flutter/sky/packages/sky_services/BUILD.gn | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 3db18ad2108..be324fccd3f 100644 --- a/DEPS +++ b/DEPS @@ -22,7 +22,6 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'github_git': 'https://github.com', - 'mojo_sdk_revision': '6b5fb1227c742f5ecc077486ebc029f2711c61fa', 'base_revision': 'b2412302ed4e45bfb47d7b5c0c3418077009e1ce', 'skia_revision': '06a65e2799eaead18f778792801406aff4aec0d9', @@ -47,7 +46,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f0135c944330591d01ffd0c685fb7ecd82253497', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'fa103279b858e49b8755fdecf2b4242067ca36cb', # Fuchsia compatibility # @@ -64,9 +63,6 @@ deps = { 'src/lib/zip': Var('fuchsia_git') + '/zip' + '@' + '92dc87ca645fe8e9f5151ef6dac86d8311a7222f', - 'src/mojo/public': - Var('fuchsia_git') + '/mojo/public' + '@' + Var('mojo_sdk_revision'), - 'src/third_party/gtest': Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72', diff --git a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn index 969168d4743..3b261ba9744 100644 --- a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn @@ -6,7 +6,7 @@ import("//dart/sdk/lib/rules.gni") import("//flutter/lib/jni/dart_jni.gni") import("//flutter/lib/ui/dart_ui.gni") import("//flutter/sky/engine/core/core.gni") -import("//mojo/public/dart/rules.gni") +import("//build/dart/rules.gni") copy("copy_sky_engine_authors") { sources = [ diff --git a/engine/src/flutter/sky/packages/sky_services/BUILD.gn b/engine/src/flutter/sky/packages/sky_services/BUILD.gn index d51dd3604a0..50d79251437 100644 --- a/engine/src/flutter/sky/packages/sky_services/BUILD.gn +++ b/engine/src/flutter/sky/packages/sky_services/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/dart/rules.gni") +import("//build/dart/rules.gni") copy("copy_sky_services_license") { sources = [