From b60a8cbbc5198f4ea32c9fa8f55be65fd59aa49b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Thu, 20 Nov 2014 17:56:41 -0800 Subject: [PATCH] Fix gn check //sky/* to pass again. Just needed to allow core and core_generated to be a cycle. TBR=abarth@chromium.org BUG=435361 Review URL: https://codereview.chromium.org/748643002 --- engine/core/BUILD.gn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/core/BUILD.gn b/engine/core/BUILD.gn index b8949a3880f..8619f38c9bb 100644 --- a/engine/core/BUILD.gn +++ b/engine/core/BUILD.gn @@ -72,6 +72,9 @@ static_library("core") { forward_dependent_configs_from = [ ":libraries", ] + + # core and core_generated are really the same thing. + allow_circular_includes_from = [ ":core_generated" ] } source_set("testing") { @@ -124,11 +127,12 @@ source_set("core_generated") { ":prerequisites", "//gin", "//skia", + "//sky/engine/bindings/core/v8:bindings_core_v8_generated", + "//sky/engine/platform", + "//sky/engine/wtf", "//third_party/iccjpeg", "//third_party/libpng", "//third_party/qcms", - "//sky/engine/bindings/core/v8:bindings_core_v8_generated", - "//sky/engine/wtf", "//url", "//v8", ]