From 66fbebaca3a7bae3fe957c4c829009330a412082 Mon Sep 17 00:00:00 2001
From: Ryan Macnak <rmacnak@google.com>
Date: Thu, 6 Jul 2017 09:40:23 -0700
Subject: [PATCH] Changes to get the profiler working for C code on Android.
 (#3847)

Roll Dart VM to daa38a2ea21d290e45adb509dc60418b22ec7eba for fix to Thumb profile sample collection.

Roll buildroot to b0b836db790abff26695a944224a4934480f2f48.
---
 DEPS                                 | 6 +++---
 tools/gn                             | 2 ++
 travis/licenses_golden/licenses_dart | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index fc1e7b0228e94..0cc12e1b411ed 100644
--- a/DEPS
+++ b/DEPS
@@ -28,9 +28,9 @@ vars = {
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
-  # You can use //dart/tools/create_updated_fluter_deps.py to produce
+  # You can use //tools/dart/create_updated_fluter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'f445c318184b30b3db997ac27f357bcb5d45670a',
+  'dart_revision': 'daa38a2ea21d290e45adb509dc60418b22ec7eba',
 
   'dart_args_tag': '0.13.7',
   'dart_async_tag': 'daf66909019d2aaec1721fc39d94ea648a9fdc1d',
@@ -75,7 +75,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '214524470c62170604261d1bed7270015c54a9b4',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'b0b836db790abff26695a944224a4934480f2f48',
 
    # Fuchsia compatibility
    #
diff --git a/tools/gn b/tools/gn
index 9ecb40ce3341a..11d634b1dc78d 100755
--- a/tools/gn
+++ b/tools/gn
@@ -156,6 +156,8 @@ def to_gn_args(args):
       gn_args['skia_use_vulkan'] = True
       gn_args['skia_vulkan_headers'] = "//third_party/vulkan/src"
 
+    gn_args['enable_profiling'] = args.runtime_mode != 'release'
+
     return gn_args
 
 def parse_args(args):
diff --git a/travis/licenses_golden/licenses_dart b/travis/licenses_golden/licenses_dart
index 3f53d33681f04..8b49e732c4f5e 100644
--- a/travis/licenses_golden/licenses_dart
+++ b/travis/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: d34d7b97577a93492f2c39e07e679483
+Signature: eb629ddf50704f1fa03fc2517e868b1f
 
 UNUSED LICENSES: