summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 14:34:44 +0000
committerdongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-20 14:34:44 +0000
commit557ca5732dab2e28f8601f47ec5146a637c03c2e (patch)
treef3a9e3a4767c4f06858a68f3483503b541a622ce
parentaedb8419f0bc16b6d6cb75a24e505368331aa037 (diff)
downloadchromium_src-557ca5732dab2e28f8601f47ec5146a637c03c2e.zip
chromium_src-557ca5732dab2e28f8601f47ec5146a637c03c2e.tar.gz
chromium_src-557ca5732dab2e28f8601f47ec5146a637c03c2e.tar.bz2
Remove all exclude rules that filename_rules.gypi already handles.
BUG= Review URL: https://codereview.chromium.org/141703005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245910 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/ash.gyp1
-rw-r--r--base/base.gyp6
-rw-r--r--base/base.gypi18
-rw-r--r--printing/printing.gyp8
-rw-r--r--ui/ui.gyp3
-rw-r--r--webkit/common/webkit_common.gyp9
6 files changed, 3 insertions, 42 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 9a1b948..4c6d99c 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -647,7 +647,6 @@
],
}, { # else: chromeos!=1
'sources/': [
- ['exclude', '/chromeos/'],
['exclude', 'display/output_configurator_animation.cc'],
['exclude', 'display/output_configurator_animation.h'],
],
diff --git a/base/base.gyp b/base/base.gyp
index 591920f..a989933 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -792,12 +792,6 @@
'dependencies': [
'../third_party/libevent/libevent.gyp:libevent'
],
- 'sources/': [
- ['exclude', '^win/'],
- ],
- 'sources!': [
- 'win/win_util_unittest.cc',
- ],
}],
['use_aura==1 and use_x11==1', {
'sources': [
diff --git a/base/base.gypi b/base/base.gypi
index 13b8260..08ffe4a 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -861,11 +861,6 @@
['exclude', '(^|/)ios/'],
]
}],
- ['OS != "mac" or >(nacl_untrusted_build)==1', {
- 'sources!': [
- 'mac/scoped_aedesc.h'
- ],
- }],
# For now, just test the *BSD platforms enough to exclude them.
# Subsequent changes will include them further.
['OS != "freebsd" or >(nacl_untrusted_build)==1', {
@@ -876,14 +871,6 @@
'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
},
],
- ['OS != "win" or >(nacl_untrusted_build)==1', {
- 'sources/': [ ['exclude', '^win/'] ],
- },
- ],
- ['OS != "android" or >(nacl_untrusted_build)==1', {
- 'sources/': [ ['exclude', '^android/'] ],
- },
- ],
['OS == "win" and >(nacl_untrusted_build)==0', {
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
@@ -932,11 +919,6 @@
['exclude', '^sys_info_linux\\.cc$'],
],
}],
- ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
- 'sources/': [
- ['exclude', '^chromeos/'],
- ],
- }],
# Remove all unnecessary files for build_nexe.py to avoid exceeding
# command-line-string limitation when building NaCl on Windows.
['OS == "win" and >(nacl_untrusted_build)==1', {
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 535e018..4b4646b 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -104,13 +104,7 @@
}],
['toolkit_uses_gtk == 0',{
'sources/': [['exclude', '_cairo\\.cc$']]
- }],
- ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
- ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']]
- }, { # else: OS=="win"
- 'sources/': [['exclude', '_posix\\.cc$']]
- }],
- ['toolkit_uses_gtk == 1', {
+ }, { # else: toolkit_uses_gtk == 1
'dependencies': [
# For FT_Init_FreeType and friends.
'../build/linux/system.gyp:freetype2',
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 4f766c0..0b8ba38 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -503,9 +503,6 @@
'base/dragdrop/drag_drop_types.h',
'base/dragdrop/os_exchange_data.cc',
],
- 'sources/': [
- ['exclude', '^base/win/'],
- ],
}],
['OS=="mac"', {
'dependencies': [
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index bad719a..3de9cff 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -84,21 +84,16 @@
'cursors/webcursor_null.cc',
],
}],
- ['OS!="mac"', {
- 'sources/': [['exclude', '_mac\\.(cc|mm)$']],
- }, { # else: OS=="mac"
+ ['OS=="mac"', {
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
],
},
}],
- ['OS!="win"', {
- 'sources/': [['exclude', '_win\\.cc$']],
- }, { # else: OS=="win"
+ ['OS=="win"', {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4800, 4267 ],
- 'sources/': [['exclude', '_posix\\.cc$']],
}],
],
},