Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2724df6

Browse files
zandersozanderso
authored
Move //third_party/benchmark to //flutter/third_party/benchmark (#47652)
As part of eliminating the Flutter buildroot (flutter/flutter#67373), we are moving all third-party dependencies from //third_party to //flutter/third_party. Once all third-party dependencies have been migrated, tooling and config will be moved and the buildroot will be eliminated altogether. No tests changed because there is no semantic change to this PR. This is simply relocating a dependency.
1 parent f363a6e commit 2724df6

File tree

8 files changed

+67
-68
lines changed

8 files changed

+67
-68
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ deps = {
294294
'src/flutter/third_party/gtest-parallel':
295295
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
296296

297-
'src/third_party/benchmark':
297+
'src/flutter/third_party/benchmark':
298298
Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
299299

300300
'src/third_party/googletest':

‎benchmarking/BUILD.gn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# found in the LICENSE file.
44

55
config("benchmark_config") {
6-
include_dirs = [ "//third_party/benchmark:benchmark_config" ]
6+
include_dirs = [ "//flutter/third_party/benchmark:benchmark_config" ]
77
}
88

99
source_set("benchmarking") {
@@ -16,7 +16,7 @@ source_set("benchmarking") {
1616

1717
public_deps = [
1818
"//flutter/fml",
19-
"//third_party/benchmark",
19+
"//flutter/third_party/benchmark",
2020
]
2121

2222
public_configs = [
@@ -39,7 +39,7 @@ source_set("benchmarking_library") {
3939
"library.h",
4040
]
4141

42-
public_deps = [ "//third_party/benchmark" ]
42+
public_deps = [ "//flutter/third_party/benchmark" ]
4343

4444
public_configs = [
4545
"//flutter:config",

‎build/secondary/flutter/third_party/benchmark/BUILD.gn‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Copyright 2016 The Fuchsia Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
config("benchmark_config") {
5+
visibility = [ ":*" ]
6+
include_dirs = [ "include" ]
7+
}
8+
static_library("benchmark") {
9+
testonly = true
10+
11+
sources = [
12+
"//flutter/third_party/benchmark/src/arraysize.h",
13+
"//flutter/third_party/benchmark/src/benchmark.cc",
14+
"//flutter/third_party/benchmark/src/benchmark_api_internal.cc",
15+
"//flutter/third_party/benchmark/src/benchmark_api_internal.h",
16+
"//flutter/third_party/benchmark/src/benchmark_main.cc",
17+
"//flutter/third_party/benchmark/src/benchmark_name.cc",
18+
"//flutter/third_party/benchmark/src/benchmark_register.cc",
19+
"//flutter/third_party/benchmark/src/benchmark_register.h",
20+
"//flutter/third_party/benchmark/src/benchmark_runner.cc",
21+
"//flutter/third_party/benchmark/src/benchmark_runner.h",
22+
"//flutter/third_party/benchmark/src/check.h",
23+
"//flutter/third_party/benchmark/src/colorprint.cc",
24+
"//flutter/third_party/benchmark/src/colorprint.h",
25+
"//flutter/third_party/benchmark/src/commandlineflags.cc",
26+
"//flutter/third_party/benchmark/src/commandlineflags.h",
27+
"//flutter/third_party/benchmark/src/complexity.cc",
28+
"//flutter/third_party/benchmark/src/complexity.h",
29+
"//flutter/third_party/benchmark/src/console_reporter.cc",
30+
"//flutter/third_party/benchmark/src/counter.cc",
31+
"//flutter/third_party/benchmark/src/counter.h",
32+
"//flutter/third_party/benchmark/src/csv_reporter.cc",
33+
"//flutter/third_party/benchmark/src/cycleclock.h",
34+
"//flutter/third_party/benchmark/src/internal_macros.h",
35+
"//flutter/third_party/benchmark/src/json_reporter.cc",
36+
"//flutter/third_party/benchmark/src/log.h",
37+
"//flutter/third_party/benchmark/src/mutex.h",
38+
"//flutter/third_party/benchmark/src/perf_counters.cc",
39+
"//flutter/third_party/benchmark/src/perf_counters.h",
40+
"//flutter/third_party/benchmark/src/re.h",
41+
"//flutter/third_party/benchmark/src/reporter.cc",
42+
"//flutter/third_party/benchmark/src/sleep.cc",
43+
"//flutter/third_party/benchmark/src/sleep.h",
44+
"//flutter/third_party/benchmark/src/statistics.cc",
45+
"//flutter/third_party/benchmark/src/statistics.h",
46+
"//flutter/third_party/benchmark/src/string_util.cc",
47+
"//flutter/third_party/benchmark/src/string_util.h",
48+
"//flutter/third_party/benchmark/src/sysinfo.cc",
49+
"//flutter/third_party/benchmark/src/thread_manager.h",
50+
"//flutter/third_party/benchmark/src/thread_timer.h",
51+
"//flutter/third_party/benchmark/src/timers.cc",
52+
"//flutter/third_party/benchmark/src/timers.h",
53+
]
54+
public_configs = [ ":benchmark_config" ]
55+
defines = [
56+
"HAVE_STD_REGEX",
57+
"HAVE_THREAD_SAFETY_ATTRIBUTES",
58+
]
59+
}

‎build/secondary/third_party/benchmark/BUILD.gn‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎ci/licenses_golden/excluded_files‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
431431
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
432432
../../../flutter/third_party/accessibility/gfx/test
433+
../../../flutter/third_party/benchmark
433434
../../../flutter/third_party/flatbuffers/.bazelci
434435
../../../flutter/third_party/flatbuffers/.clang-format
435436
../../../flutter/third_party/flatbuffers/.editorconfig
@@ -1347,7 +1348,6 @@
13471348
../../../third_party/angle/third_party
13481349
../../../third_party/angle/tools
13491350
../../../third_party/angle/util
1350-
../../../third_party/benchmark
13511351
../../../third_party/boringssl/.git
13521352
../../../third_party/boringssl/.gitignore
13531353
../../../third_party/boringssl/OWNERS

‎ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 88225600314ebc39278ede6c886440b5
1+
Signature: 58eabd70bbf9797956ee94d042df857d
22

‎third_party/txt/BUILD.gn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ if (enable_unittests) {
137137
":txt_fixtures",
138138
"//flutter/fml",
139139
"//flutter/testing:testing_lib",
140-
"//third_party/benchmark",
140+
"//flutter/third_party/benchmark",
141141
"//third_party/skia/modules/skparagraph",
142142
]
143143
}

‎tools/licenses/lib/paths.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ final Set<String> skippedPaths = <String>{
2929
r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
3030
r'flutter/prebuilts',
3131
r'flutter/sky/packages/sky_engine/LICENSE',
32+
r'flutter/third_party/benchmark', // only used by tests
3233
r'flutter/third_party/flatbuffers/android',
3334
r'flutter/third_party/flatbuffers/benchmarks',
3435
r'flutter/third_party/flatbuffers/docs',
@@ -74,7 +75,6 @@ final Set<String> skippedPaths = <String>{
7475
r'third_party/angle/third_party', // Unused by Flutter: BUILD files with forwarding targets (but no code).
7576
r'third_party/angle/tools', // These are build-time tools, and aren't shipped.
7677
r'third_party/angle/util',
77-
r'third_party/benchmark', // only used by tests
7878
r'third_party/boringssl/src/crypto/err/err_data_generate.go',
7979
r'third_party/boringssl/src/fuzz', // testing tools, not shipped
8080
r'third_party/boringssl/src/rust', // rust-related code is not shipped

0 commit comments

Comments
 (0)