Skip to content

Commit

Permalink
Include wifi_component only when in Win or Mac platforms.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tfarina@chromium.org committed Apr 24, 2014
1 parent 8ecd5fa commit c6afb98
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
4 changes: 3 additions & 1 deletion chrome/chrome.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
4 changes: 3 additions & 1 deletion chrome/chrome_browser_extensions.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
4 changes: 4 additions & 0 deletions components/components.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
'visitedlink.gypi',
'web_contents_delegate_android.gypi',
'web_modal.gypi',
],
}],
['OS == "win" or OS == "mac"', {
'includes': [
'wifi.gypi',
],
}],
Expand Down
6 changes: 3 additions & 3 deletions components/wifi.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
'..',
Expand Down Expand Up @@ -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': [
'..',
Expand Down

0 comments on commit c6afb98

Please sign in to comment.