Skip to content

Commit

Permalink
Move //third_party/benchmark to //flutter/third_party/benchmark (flut…
Browse files Browse the repository at this point in the history
…ter#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.
  • Loading branch information
zanderso authored Nov 3, 2023
1 parent f363a6e commit 2724df6
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 68 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ deps = {
'src/flutter/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',

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

'src/third_party/googletest':
Expand Down
6 changes: 3 additions & 3 deletions benchmarking/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# found in the LICENSE file.

config("benchmark_config") {
include_dirs = [ "//third_party/benchmark:benchmark_config" ]
include_dirs = [ "//flutter/third_party/benchmark:benchmark_config" ]
}

source_set("benchmarking") {
Expand All @@ -16,7 +16,7 @@ source_set("benchmarking") {

public_deps = [
"//flutter/fml",
"//third_party/benchmark",
"//flutter/third_party/benchmark",
]

public_configs = [
Expand All @@ -39,7 +39,7 @@ source_set("benchmarking_library") {
"library.h",
]

public_deps = [ "//third_party/benchmark" ]
public_deps = [ "//flutter/third_party/benchmark" ]

public_configs = [
"//flutter:config",
Expand Down
59 changes: 59 additions & 0 deletions build/secondary/flutter/third_party/benchmark/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Copyright 2016 The Fuchsia Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
config("benchmark_config") {
visibility = [ ":*" ]
include_dirs = [ "include" ]
}
static_library("benchmark") {
testonly = true

sources = [
"//flutter/third_party/benchmark/src/arraysize.h",
"//flutter/third_party/benchmark/src/benchmark.cc",
"//flutter/third_party/benchmark/src/benchmark_api_internal.cc",
"//flutter/third_party/benchmark/src/benchmark_api_internal.h",
"//flutter/third_party/benchmark/src/benchmark_main.cc",
"//flutter/third_party/benchmark/src/benchmark_name.cc",
"//flutter/third_party/benchmark/src/benchmark_register.cc",
"//flutter/third_party/benchmark/src/benchmark_register.h",
"//flutter/third_party/benchmark/src/benchmark_runner.cc",
"//flutter/third_party/benchmark/src/benchmark_runner.h",
"//flutter/third_party/benchmark/src/check.h",
"//flutter/third_party/benchmark/src/colorprint.cc",
"//flutter/third_party/benchmark/src/colorprint.h",
"//flutter/third_party/benchmark/src/commandlineflags.cc",
"//flutter/third_party/benchmark/src/commandlineflags.h",
"//flutter/third_party/benchmark/src/complexity.cc",
"//flutter/third_party/benchmark/src/complexity.h",
"//flutter/third_party/benchmark/src/console_reporter.cc",
"//flutter/third_party/benchmark/src/counter.cc",
"//flutter/third_party/benchmark/src/counter.h",
"//flutter/third_party/benchmark/src/csv_reporter.cc",
"//flutter/third_party/benchmark/src/cycleclock.h",
"//flutter/third_party/benchmark/src/internal_macros.h",
"//flutter/third_party/benchmark/src/json_reporter.cc",
"//flutter/third_party/benchmark/src/log.h",
"//flutter/third_party/benchmark/src/mutex.h",
"//flutter/third_party/benchmark/src/perf_counters.cc",
"//flutter/third_party/benchmark/src/perf_counters.h",
"//flutter/third_party/benchmark/src/re.h",
"//flutter/third_party/benchmark/src/reporter.cc",
"//flutter/third_party/benchmark/src/sleep.cc",
"//flutter/third_party/benchmark/src/sleep.h",
"//flutter/third_party/benchmark/src/statistics.cc",
"//flutter/third_party/benchmark/src/statistics.h",
"//flutter/third_party/benchmark/src/string_util.cc",
"//flutter/third_party/benchmark/src/string_util.h",
"//flutter/third_party/benchmark/src/sysinfo.cc",
"//flutter/third_party/benchmark/src/thread_manager.h",
"//flutter/third_party/benchmark/src/thread_timer.h",
"//flutter/third_party/benchmark/src/timers.cc",
"//flutter/third_party/benchmark/src/timers.h",
]
public_configs = [ ":benchmark_config" ]
defines = [
"HAVE_STD_REGEX",
"HAVE_THREAD_SAFETY_ATTRIBUTES",
]
}
60 changes: 0 additions & 60 deletions build/secondary/third_party/benchmark/BUILD.gn

This file was deleted.

2 changes: 1 addition & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
../../../flutter/third_party/accessibility/gfx/test
../../../flutter/third_party/benchmark
../../../flutter/third_party/flatbuffers/.bazelci
../../../flutter/third_party/flatbuffers/.clang-format
../../../flutter/third_party/flatbuffers/.editorconfig
Expand Down Expand Up @@ -1347,7 +1348,6 @@
../../../third_party/angle/third_party
../../../third_party/angle/tools
../../../third_party/angle/util
../../../third_party/benchmark
../../../third_party/boringssl/.git
../../../third_party/boringssl/.gitignore
../../../third_party/boringssl/OWNERS
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 88225600314ebc39278ede6c886440b5
Signature: 58eabd70bbf9797956ee94d042df857d

2 changes: 1 addition & 1 deletion third_party/txt/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ if (enable_unittests) {
":txt_fixtures",
"//flutter/fml",
"//flutter/testing:testing_lib",
"//third_party/benchmark",
"//flutter/third_party/benchmark",
"//third_party/skia/modules/skparagraph",
]
}
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
r'flutter/prebuilts',
r'flutter/sky/packages/sky_engine/LICENSE',
r'flutter/third_party/benchmark', // only used by tests
r'flutter/third_party/flatbuffers/android',
r'flutter/third_party/flatbuffers/benchmarks',
r'flutter/third_party/flatbuffers/docs',
Expand Down Expand Up @@ -74,7 +75,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/angle/third_party', // Unused by Flutter: BUILD files with forwarding targets (but no code).
r'third_party/angle/tools', // These are build-time tools, and aren't shipped.
r'third_party/angle/util',
r'third_party/benchmark', // only used by tests
r'third_party/boringssl/src/crypto/err/err_data_generate.go',
r'third_party/boringssl/src/fuzz', // testing tools, not shipped
r'third_party/boringssl/src/rust', // rust-related code is not shipped
Expand Down

0 comments on commit 2724df6

Please sign in to comment.