From 78dbc1439d84e35f59dbb2f3b1266cf7b951f9b8 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Fri, 30 Apr 2021 12:20:39 +0000 Subject: [PATCH] Revert "[build] Fix gn check failures in v8/third_party" This reverts commit e13a744a45df69cc316980c6f2a107b14ff5dff6. Reason for revert: breaks perfetto: https://ci.chromium.org/p/v8/builders/ci/V8%20Linux64%20-%20debug%20-%20perfetto%20-%20builder/12849 Original change's description: > [build] Fix gn check failures in v8/third_party > > This removes the blanket exclusion for third_party but leaves > third_party/icu excluded (which is the same as chrome). > > Most fixed issues are to do with previously removed header files and > missing dependencies. > > Bug: v8:7330 > Change-Id: I7e634e35c0620a1f3db9aba01119921e4f781e3e > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2856838 > Auto-Submit: Dan Elphick > Reviewed-by: Michael Achenbach > Commit-Queue: Michael Achenbach > Cr-Commit-Position: refs/heads/master@{#74295} Bug: v8:7330 Change-Id: I05cf897c0aeb6bf87f9889b878358c0d02600081 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2862767 Auto-Submit: Michael Achenbach Commit-Queue: Rubber Stamper Bot-Commit: Rubber Stamper Cr-Commit-Position: refs/heads/master@{#74300} --- .gn | 2 +- third_party/google_benchmark/BUILD.gn | 1 + third_party/googletest/BUILD.gn | 18 ++++++++++++------ third_party/inspector_protocol/BUILD.gn | 6 +----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gn b/.gn index 5fe9f27324..028a530ffd 100644 --- a/.gn +++ b/.gn @@ -16,7 +16,7 @@ no_check_targets = [ "//:v8_internal_headers", "//src/inspector:inspector", "//test/cctest:cctest_sources", - "//third_party/icu:*", + "//third_party/*", ] # These are the list of GN files that run exec_script. This whitelist exists diff --git a/third_party/google_benchmark/BUILD.gn b/third_party/google_benchmark/BUILD.gn index 2c863af8e5..3df88e241f 100644 --- a/third_party/google_benchmark/BUILD.gn +++ b/third_party/google_benchmark/BUILD.gn @@ -36,6 +36,7 @@ if (v8_enable_google_benchmark) { "src/src/counter.cc", "src/src/counter.h", "src/src/csv_reporter.cc", + "src/src/cycle_clock.h", "src/src/internal_macros.h", "src/src/json_reporter.cc", "src/src/log.h", diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn index 4d393efd95..085794264f 100644 --- a/third_party/googletest/BUILD.gn +++ b/third_party/googletest/BUILD.gn @@ -51,6 +51,8 @@ config("gmock_config") { source_set("gtest") { testonly = true sources = [ + # TODO(crbug.com/829773): Remove this after transitioning off . + "custom/gmock/internal/custom/gmock-port.h", "src/googletest/include/gtest/gtest-death-test.h", "src/googletest/include/gtest/gtest-matchers.h", "src/googletest/include/gtest/gtest-message.h", @@ -64,9 +66,12 @@ source_set("gtest") { "src/googletest/include/gtest/internal/gtest-death-test-internal.h", "src/googletest/include/gtest/internal/gtest-filepath.h", "src/googletest/include/gtest/internal/gtest-internal.h", + "src/googletest/include/gtest/internal/gtest-linked_ptr.h", + "src/googletest/include/gtest/internal/gtest-param-util-generated.h", "src/googletest/include/gtest/internal/gtest-param-util.h", "src/googletest/include/gtest/internal/gtest-port.h", "src/googletest/include/gtest/internal/gtest-string.h", + "src/googletest/include/gtest/internal/gtest-tuple.h", "src/googletest/include/gtest/internal/gtest-type-util.h", #"src/googletest/src/gtest-all.cc", # Not needed by our build. @@ -124,16 +129,22 @@ source_set("gmock") { "src/googlemock/include/gmock/gmock-actions.h", "src/googlemock/include/gmock/gmock-cardinalities.h", "src/googlemock/include/gmock/gmock-function-mocker.h", + "src/googlemock/include/gmock/gmock-generated-actions.h", + "src/googlemock/include/gmock/gmock-generated-nice-strict.h", "src/googlemock/include/gmock/gmock-matchers.h", "src/googlemock/include/gmock/gmock-more-actions.h", "src/googlemock/include/gmock/gmock-more-matchers.h", "src/googlemock/include/gmock/gmock-nice-strict.h", "src/googlemock/include/gmock/gmock-spec-builders.h", "src/googlemock/include/gmock/gmock.h", + "src/googlemock/include/gmock/internal/gmock-generated-internal-utils.h", "src/googlemock/include/gmock/internal/gmock-internal-utils.h", "src/googlemock/include/gmock/internal/gmock-port.h", "src/googlemock/include/gmock/internal/gmock-pp.h", + # gmock helpers. + "custom/gmock/internal/custom/gmock-port.h", + #"src/googlemock/src/gmock-all.cc", # Not needed by our build. "src/googlemock/src/gmock-cardinalities.cc", "src/googlemock/src/gmock-internal-utils.cc", @@ -155,8 +166,6 @@ source_set("gmock") { ":gmock_config", ":gtest_config", ] - - deps = [ ":gtest" ] } # Do NOT depend on this directly. Use //testing/gmock:gmock_main instead. @@ -164,8 +173,5 @@ source_set("gmock") { static_library("gmock_main") { testonly = true sources = [ "src/googlemock/src/gmock_main.cc" ] - deps = [ - ":gmock", - ":gtest", - ] + deps = [ ":gmock" ] } diff --git a/third_party/inspector_protocol/BUILD.gn b/third_party/inspector_protocol/BUILD.gn index 94b7fe2677..880b651c09 100644 --- a/third_party/inspector_protocol/BUILD.gn +++ b/third_party/inspector_protocol/BUILD.gn @@ -5,10 +5,7 @@ import("../../gni/v8.gni") config("crdtp_config") { - visibility = [ - ":*", - "../../src/inspector:*", - ] + visibility = [ "../../src/inspector:*", ":*" ] configs = [ "../../:internal_config" ] include_dirs = [ "../../include" ] } @@ -49,7 +46,6 @@ v8_source_set("crdtp_platform") { "crdtp/json_platform_v8.cc", ] public_deps = [ "../..:v8_libbase" ] - deps = [ "../../:v8_internal_headers" ] configs = [ ":crdtp_config" ] }