Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Side by Side Diff: Source/WebKit/chromium/WebKitUnitTests.gyp

Issue 20652002: Fix trailing whitespace in scripts and misc. files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't change literal diff. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 'include_dirs': [ 118 'include_dirs': [
119 '../../../public/web/mac', 119 '../../../public/web/mac',
120 ], 120 ],
121 }], 121 }],
122 [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', { 122 [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', {
123 'dependencies': [ 123 'dependencies': [
124 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 124 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
125 ], 125 ],
126 }], 126 }],
127 ], 127 ],
128 } 128 }
129 ], # targets 129 ], # targets
130 'conditions': [ 130 'conditions': [
131 ['gcc_version>=46', { 131 ['gcc_version>=46', {
132 'target_defaults': { 132 'target_defaults': {
133 # Disable warnings about c++0x compatibility, as some names (suc h 133 # Disable warnings about c++0x compatibility, as some names (suc h
134 # as nullptr) conflict with upcoming c++0x types. 134 # as nullptr) conflict with upcoming c++0x types.
135 'cflags_cc': ['-Wno-c++0x-compat'], 135 'cflags_cc': ['-Wno-c++0x-compat'],
136 }, 136 },
137 }], 137 }],
138 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', { 138 ['OS=="android" and android_webview_build==0 and gtest_target_type == "s hared_library"', {
(...skipping 16 matching lines...) Expand all
155 ['clang==1', { 155 ['clang==1', {
156 'target_defaults': { 156 'target_defaults': {
157 'cflags': ['-Wunused-parameter'], 157 'cflags': ['-Wunused-parameter'],
158 'xcode_settings': { 158 'xcode_settings': {
159 'WARNING_CFLAGS': ['-Wunused-parameter'], 159 'WARNING_CFLAGS': ['-Wunused-parameter'],
160 }, 160 },
161 }, 161 },
162 }], 162 }],
163 ], 163 ],
164 } 164 }
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-more-accept-header_wsh.py ('k') | Source/core/features.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698