From 1f4cc8b4ee92d01bb1f7ddb00bbc7d24b1c194bf Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Tue, 1 Dec 2020 18:32:10 -0800 Subject: [PATCH] Revert "Roll buildroot and benchmark (#22804)" (flutter/engine#22816) This reverts commit 0d078a2b1661236e3a813b30788d367943599085. --- DEPS | 4 ++-- engine/src/flutter/benchmarking/benchmarking.h | 2 +- .../third_party/txt/benchmarks/paint_record_benchmarks.cc | 2 +- .../third_party/txt/benchmarks/paragraph_benchmarks.cc | 2 +- .../txt/benchmarks/paragraph_builder_benchmarks.cc | 2 +- .../third_party/txt/benchmarks/skparagraph_benchmarks.cc | 2 +- .../third_party/txt/benchmarks/styled_runs_benchmarks.cc | 2 +- .../third_party/txt/benchmarks/txt_run_all_benchmarks.cc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index cb1b807431..33d3d1570d 100644 --- a/DEPS +++ b/DEPS @@ -102,7 +102,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '084f0d394f5b8fab6ddc2edb4837e20209a726a0', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '4985b584a430ea3fda9433dccafa5047531e0974', # Fuchsia compatibility # @@ -111,7 +111,7 @@ deps = { # and not have to specific specific hashes. 'src/third_party/benchmark': - Var('github_git') + '/google/benchmark' + '@' + 'bf585a2789e30585b4e3ce6baf11ef2750b54677', + Var('fuchsia_git') + '/third_party/benchmark' + '@' + 'a779ffce872b4c811beef482e18bd0b63626aa42', 'src/third_party/googletest': Var('fuchsia_git') + '/third_party/googletest' + '@' + '3fef9015bfe7617d57806cd7c73a653b28559fae', diff --git a/engine/src/flutter/benchmarking/benchmarking.h b/engine/src/flutter/benchmarking/benchmarking.h index 663095f912..d84004f4d8 100644 --- a/engine/src/flutter/benchmarking/benchmarking.h +++ b/engine/src/flutter/benchmarking/benchmarking.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_BENCHMARKING_BENCHMARKING_H_ #define FLUTTER_BENCHMARKING_BENCHMARKING_H_ -#include "benchmark/benchmark.h" +#include "benchmark/benchmark_api.h" namespace benchmarking { diff --git a/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc index 52366031c9..c042dfcdcc 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/paint_record_benchmarks.cc @@ -17,7 +17,7 @@ #include "flutter/fml/command_line.h" #include "flutter/fml/logging.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "txt/paint_record.h" #include "txt/text_style.h" diff --git a/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc index babd637093..c0a6573dd7 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/paragraph_benchmarks.cc @@ -22,7 +22,7 @@ #include "flutter/fml/logging.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" #include "minikin/LayoutUtils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/engine/src/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc index b507db32e1..7e378f365c 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/paragraph_builder_benchmarks.cc @@ -16,7 +16,7 @@ #include "flutter/fml/logging.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/skia/include/core/SkColor.h" #include "txt/font_collection.h" diff --git a/engine/src/flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc index cb4775441c..556478297b 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/skparagraph_benchmarks.cc @@ -19,7 +19,7 @@ #include "flutter/fml/command_line.h" #include "flutter/fml/logging.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/engine/src/flutter/third_party/txt/benchmarks/styled_runs_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/styled_runs_benchmarks.cc index 1253f96fad..4e501abc76 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/styled_runs_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/styled_runs_benchmarks.cc @@ -17,7 +17,7 @@ #include "flutter/fml/command_line.h" #include "flutter/fml/logging.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" #include "txt/styled_runs.h" #include "txt/text_style.h" diff --git a/engine/src/flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc b/engine/src/flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc index 3b3d5e741c..69da7b6a06 100644 --- a/engine/src/flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc +++ b/engine/src/flutter/third_party/txt/benchmarks/txt_run_all_benchmarks.cc @@ -18,7 +18,7 @@ #include "flutter/fml/logging.h" #include "flutter/testing/testing.h" #include "flutter/third_party/txt/tests/txt_test_utils.h" -#include "third_party/benchmark/include/benchmark/benchmark.h" +#include "third_party/benchmark/include/benchmark/benchmark_api.h" // We will use a custom main to allow custom font directories for consistency. int main(int argc, char** argv) {