From 284bf36fd4ea0aa505f9e3c8a99d8034f018d39a Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Thu, 15 Jun 2023 18:13:55 -0700
Subject: [PATCH 1/2] malioc

---
 DEPS                           |  2 +-
 impeller/tools/malioc.gni      |  5 ++---
 impeller/tools/malioc_cores.py | 12 ++++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/DEPS b/DEPS
index 72dbc53f383ee..962bb0b400db0 100644
--- a/DEPS
+++ b/DEPS
@@ -257,7 +257,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'fabb92f0ada787444ad0be22638c80a6d5927a2c',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '84f3ac239e6872054d986085127bb5c3ff3f1ca8',
 
    # Fuchsia compatibility
    #
diff --git a/impeller/tools/malioc.gni b/impeller/tools/malioc.gni
index 062a931cd1f02..bc9d7d4686d1b 100644
--- a/impeller/tools/malioc.gni
+++ b/impeller/tools/malioc.gni
@@ -70,7 +70,7 @@ template("malioc_analyze_shaders") {
                                          "script",
                                        ])
 
-                script = "//build/gn_run_binary.py"
+                script = "//build/gn_run_malioc.py"
                 pool = "//flutter/impeller/tools:malioc_pool"
 
                 # Nest all malioc output under its own subdirectory of root_gen_dir
@@ -101,13 +101,12 @@ template("malioc_analyze_shaders") {
 
                 args = [
                   rebase_path(impeller_malioc_path, root_build_dir),
+                  rebase_path(output_file),
                   "--format",
                   "json",
                   shader_kind_flag,
                   "--core",
                   core.core,
-                  "--output",
-                  rebase_path(output_file),
                 ]
 
                 if (backend_ext == "vkspv") {
diff --git a/impeller/tools/malioc_cores.py b/impeller/tools/malioc_cores.py
index 0f03977301c22..9bd364ec1f6f4 100755
--- a/impeller/tools/malioc_cores.py
+++ b/impeller/tools/malioc_cores.py
@@ -40,7 +40,10 @@ def validate_args(args):
 
 
 def malioc_core_list(malioc):
-  malioc_cores = subprocess.check_output([malioc, '--list', '--format', 'json'])
+  malioc_cores = subprocess.check_output(
+      [malioc, '--list', '--format', 'json'],
+      stderr=subprocess.STDOUT,
+  )
   cores_json = json.loads(malioc_cores)
   cores = []
   for core in cores_json['cores']:
@@ -49,9 +52,10 @@ def malioc_core_list(malioc):
 
 
 def malioc_core_info(malioc, core):
-  malioc_info = subprocess.check_output([
-      malioc, '--info', '--core', core, '--format', 'json'
-  ])
+  malioc_info = subprocess.check_output(
+      [malioc, '--info', '--core', core, '--format', 'json'],
+      stderr=subprocess.STDOUT,
+  )
   info_json = json.loads(malioc_info)
 
   apis = info_json['apis']

From 7e51cb736dde099e692d01776a73050d7162f071 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Fri, 16 Jun 2023 17:11:42 -0700
Subject: [PATCH 2/2] Update DEPS

---
 DEPS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 962bb0b400db0..9f07466adbddc 100644
--- a/DEPS
+++ b/DEPS
@@ -257,7 +257,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '84f3ac239e6872054d986085127bb5c3ff3f1ca8',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '0ebf2593785cd440cbc35caced03fce2b99f750f',
 
    # Fuchsia compatibility
    #