From c6afb98b131596c21a9bd8389a1fa78a7409627c Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 24 Apr 2014 23:04:32 +0000 Subject: [PATCH] Include wifi_component only when in Win or Mac platforms. This issue was found while doing https://codereview.chromium.org/243343002 and we discovered that android was building wifi_test target. It was building this target because it does: $ ninja -C out/Debug -j50 And that builds all the targets generated by gyp. Since the target was not excluded from android platform, a target was created there and thus the above command would build it. This patch fixes this problem, by only including it where it is actually supported. BUG=None TEST=green trybots R=mef@chromium.org,thestig@chromium.org TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/259543002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266025 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome.gyp | 4 +++- chrome/chrome_browser_extensions.gypi | 4 +++- components/components.gyp | 4 ++++ components/wifi.gypi | 6 +++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 123ada306a93e6..646ca47dae1e22 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -237,7 +237,6 @@ 'dependencies': [ 'common/extensions/api/api.gyp:chrome_api', '../base/base.gyp:base', - '../components/components.gyp:wifi_component', '../components/components_strings.gyp:components_strings', '../content/content.gyp:content_common', '../content/content.gyp:content_utility', @@ -313,6 +312,9 @@ ], 'conditions': [ ['OS=="win" or OS=="mac"', { + 'dependencies': [ + '../components/components.gyp:wifi_component', + ], 'sources': [ 'utility/media_galleries/iapps_xml_utils.cc', 'utility/media_galleries/iapps_xml_utils.h', diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 56886fe3dd9c83..40170aa3f277ef 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -32,7 +32,6 @@ '../apps/common/api/api.gyp:apps_api', '../components/components.gyp:onc_component', '../components/components.gyp:url_matcher', - '../components/components.gyp:wifi_component', '../components/components_strings.gyp:components_strings', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', @@ -1073,6 +1072,9 @@ ], }], ['OS=="win" or OS=="mac"', { + 'dependencies': [ + '../components/components.gyp:wifi_component', + ], 'sources': [ 'browser/extensions/api/networking_private/networking_private_api.h', 'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc', diff --git a/components/components.gyp b/components/components.gyp index 182c1be63e3a47..9b0d49c1674c84 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -52,6 +52,10 @@ 'visitedlink.gypi', 'web_contents_delegate_android.gypi', 'web_modal.gypi', + ], + }], + ['OS == "win" or OS == "mac"', { + 'includes': [ 'wifi.gypi', ], }], diff --git a/components/wifi.gypi b/components/wifi.gypi index 3090bd2dc6259e..9b6d4d1125194d 100644 --- a/components/wifi.gypi +++ b/components/wifi.gypi @@ -9,8 +9,8 @@ 'type': '<(component)', 'dependencies': [ '../base/base.gyp:base', - '../components/components.gyp:onc_component', '../third_party/libxml/libxml.gyp:libxml', + 'onc_component', ], 'include_dirs': [ '..', @@ -48,9 +48,9 @@ 'target_name': 'wifi_test', 'type': 'executable', 'dependencies': [ - 'wifi_component', '../base/base.gyp:base', - '../components/components.gyp:onc_component', + 'onc_component', + 'wifi_component', ], 'include_dirs': [ '..',