From 4f80971f11ea538a8e9d2cd58655799c9ebc33a6 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 5 Aug 2016 15:33:21 -0700 Subject: [PATCH] sky_snapshot: fix the types of Dart snapshot buffer symbols (flutter/engine#2876) Also pick up some needed fixes to FTL and Tonic --- DEPS | 4 ++-- engine/src/flutter/sky/tools/sky_snapshot/main.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 70efd6f5818..2c0eba6d263 100644 --- a/DEPS +++ b/DEPS @@ -50,10 +50,10 @@ deps = { # and not have to specific specific hashes. 'src/lib/ftl': - Var('fuchsia_git') + '/ftl' + '@' + 'e9ebb15d179fed9467e5fb3ce6fb807cc4ad9a8b', + Var('fuchsia_git') + '/ftl' + '@' + 'be8fe290130170e78cbd3cedbf2ba580c22ced43', 'src/lib/tonic': - Var('fuchsia_git') + '/tonic' + '@' + '325db6a9d6d32351e86843e5db0dfaad5f8651bf', + Var('fuchsia_git') + '/tonic' + '@' + '4c73592aceba378355e245b797017ff4c02a9248', 'src/third_party/gtest': Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72', diff --git a/engine/src/flutter/sky/tools/sky_snapshot/main.cc b/engine/src/flutter/sky/tools/sky_snapshot/main.cc index 4a836c4d3f9..838766ad3b3 100644 --- a/engine/src/flutter/sky/tools/sky_snapshot/main.cc +++ b/engine/src/flutter/sky/tools/sky_snapshot/main.cc @@ -22,8 +22,8 @@ #include "lib/tonic/file_loader/file_loader.h" extern "C" { -extern const uint8_t* kDartVmIsolateSnapshotBuffer; -extern const uint8_t* kDartIsolateSnapshotBuffer; +extern const uint8_t kDartVmIsolateSnapshotBuffer[]; +extern const uint8_t kDartIsolateSnapshotBuffer[]; } namespace sky_snapshot {