Revert "[gn build] (manually) port 1ee32055ea1d (benchmark move)"

1ee32055ea1d was reverted in 67de95b8c955.

This reverts commit a8e8e2d5a22636dba2f38d5eda7440a31933e8be
and follow-up a0dc6001df20fcd92e8eb9e196d403859f1b5192

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
index 9489f68..879d5a2 100644 (file)
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
@@ -3,6 +3,6 @@ executable("ScudoBenchmarks") {
   sources = [ "malloc_benchmark.cpp" ]
   deps = [
     "//compiler-rt/lib/scudo/standalone:sources",
-    "//third-party/benchmark",
+    "//llvm/utils/benchmark",
   ]
 }

diff --git a/llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
similarity index 82%
rename from llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn
rename to llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
index a011976..39f5a22 100644 (file)
--- a/llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
@@ -1,9 +1,6 @@
 static_library("benchmark") {
   sources = [
     "src/benchmark.cc",
-    "src/benchmark_api_internal.cc",
-    "src/benchmark_name.cc",
-    "src/benchmark_runner.cc",
     "src/benchmark_register.cc",
     "src/colorprint.cc",
     "src/commandlineflags.cc",
@@ -12,7 +9,6 @@ static_library("benchmark") {
     "src/counter.cc",
     "src/csv_reporter.cc",
     "src/json_reporter.cc",
-    "src/perf_counters.cc",
     "src/reporter.cc",
     "src/sleep.cc",
     "src/statistics.cc",