From 6b8ddeb96d5e0e8bd14331a0fe9f52ca36a2dbed Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Mon, 15 Feb 2021 09:42:19 +0000 Subject: [PATCH] Revert "[build] Remove V8_GN_HEADER hybrid mode" This reverts commit 6beed8d5443c9a4b47cc7aa19860dac635812603. Reason for revert: Breaks some targets that lack a dependency onto v8-gn.h, see https://crbug.com/1178409. Original change's description: > [build] Remove V8_GN_HEADER hybrid mode > > v8_generate_external_defines_header has been enabled for a couple of > weeks now with no problems, so this removes the hybrid state where > V8_GN_HEADER was defined on the command line along with the other > defines. > > Bug: v8:11292, v8:11341 > Change-Id: Ie78f00afe5d1cbca751101a7beb61a18c7d86d04 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2681947 > Commit-Queue: Michael Lippautz > Auto-Submit: Dan Elphick > Reviewed-by: Michael Lippautz > Cr-Commit-Position: refs/heads/master@{#72597} TBR=mlippautz@chromium.org,delphick@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. No-try: true Bug: v8:11292 Bug: v8:11341 Bug: chromium:1178409 Change-Id: Ic730ae1bdfe09b13cc0bec96a092822b1874fb0f Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2692702 Commit-Queue: Michael Lippautz Reviewed-by: Michael Lippautz Cr-Commit-Position: refs/heads/master@{#72731} --- BUILD.gn | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9c8cf50b45..228f50ce6f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -575,10 +575,12 @@ disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines config("v8_header_features") { visibility = [ ":*" ] + # TODO(v8:11292): Set defines as well as including the header. This is a short + # term change to check that the header doesn't get stale and fail to get + # updated. + defines = enabled_external_v8_defines if (v8_generate_external_defines_header) { - defines = [ "V8_GN_HEADER" ] - } else { - defines = enabled_external_v8_defines + defines += [ "V8_GN_HEADER" ] } } @@ -608,10 +610,12 @@ disabled_external_cppgc_defines = config("cppgc_header_features") { visibility = [ ":*" ] + # TODO(v8:11292): Set defines as well as including the header. This is a short + # term change to check that the header doesn't get stale and fail to get + # updated. + defines = enabled_external_cppgc_defines if (v8_generate_external_defines_header) { - defines = [ "V8_GN_HEADER" ] - } else { - defines = enabled_external_cppgc_defines + defines += [ "V8_GN_HEADER" ] } }