diff --git a/DEPS b/DEPS index 72dbc53f383ee..9f07466adbddc 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' + '@' + '0ebf2593785cd440cbc35caced03fce2b99f750f', # 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']