From 3f036fc0ba4ca4483fe77822f8605c277d37ee24 Mon Sep 17 00:00:00 2001 From: brettw Date: Thu, 9 Apr 2015 12:36:02 -0700 Subject: [PATCH] Windows GN component build fixes. This fixes the d8 target which previously was getting both USING_V8_SHARED and BUILDING_V8_SHARED defined at the same time. Renames direct_dependent_configs to public_configs (new name, same thing). Review URL: https://codereview.chromium.org/1065403002 Cr-Commit-Position: refs/heads/master@{#27713} --- BUILD.gn | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 34500fe..98987df 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1527,7 +1527,7 @@ if (component_mode == "shared_library") { ":toolchain", ] - direct_dependent_configs = [ ":external_config" ] + public_configs = [ ":external_config" ] libs = [] if (is_android && current_toolchain != host_toolchain) { @@ -1554,7 +1554,7 @@ if (component_mode == "shared_library") { ] } - direct_dependent_configs = [ ":external_config" ] + public_configs = [ ":external_config" ] } } @@ -1571,7 +1571,10 @@ if ((current_toolchain == host_toolchain && v8_toolset_for_d8 == "host") || configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ - ":internal_config", + # Note: don't use :internal_config here because this target will get + # the :external_config applied to it by virtue of depending on :v8, and + # you can't have both applied to the same target. + ":internal_config_base", ":features", ":toolchain", ] -- 2.7.4