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

Side by Side Diff: sdch/sdch.gyp

Issue 205963004: always use -Wno-deprecated-declarations when building sdch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'open-vcdiff/vsprojects/stdint.h', 45 'open-vcdiff/vsprojects/stdint.h',
46 ], 46 ],
47 'include_dirs': [ 47 'include_dirs': [
48 'open-vcdiff/src', 48 'open-vcdiff/src',
49 ], 49 ],
50 'direct_dependent_settings': { 50 'direct_dependent_settings': {
51 'include_dirs': [ 51 'include_dirs': [
52 'open-vcdiff/src', 52 'open-vcdiff/src',
53 ], 53 ],
54 }, 54 },
55 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11.
56 'cflags': [ '-Wno-deprecated-declarations' ],
jochen (gone - plz use gerrit) 2014/03/20 16:19:01 does windows understand this? maybe we need os_pos
Nico 2014/03/20 16:23:05 Windows doesn't use 'cflags'. But gcc 4.6 might ge
Mostyn Bramley-Moore 2014/03/20 16:24:17 Oh, right. I always forget windows. Will do.
Nico 2014/03/20 16:25:05 Nonono, windows doesn't use cflags.
Mostyn Bramley-Moore 2014/03/20 16:29:23 OK, I'll move it back then.
55 'conditions': [ 57 'conditions': [
56 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], 58 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ],
57 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], 59 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ],
58 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], 60 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ],
59 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], 61 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ],
60 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], 62 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ],
61 # TODO(mark): Remove usage of the deprecated auto_ptr.
62 [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ],
63 ], 63 ],
64 # open-vcdiff's logging.h introduces static initializers. This was 64 # open-vcdiff's logging.h introduces static initializers. This was
65 # reported upstream years ago ( 65 # reported upstream years ago (
66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since 66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since
67 # upstream won't fix this, work around it on the chromium side: 67 # upstream won't fix this, work around it on the chromium side:
68 # Inject a header that forwards to base/logging.h instead (which doesn't 68 # Inject a header that forwards to base/logging.h instead (which doesn't
69 # introduce static initializers, and which prevents open-vcdiff's 69 # introduce static initializers, and which prevents open-vcdiff's
70 # logging.h from being used). 70 # logging.h from being used).
71 'variables': { 71 'variables': {
72 'logging_path': 'logging_forward.h', 72 'logging_path': 'logging_forward.h',
(...skipping 20 matching lines...) Expand all
93 'ForcedIncludeFiles': [ 93 'ForcedIncludeFiles': [
94 'intsafe_workaround.h', # http://crbug.com/308740 94 'intsafe_workaround.h', # http://crbug.com/308740
95 'sdch/<(logging_path)', 95 'sdch/<(logging_path)',
96 ] 96 ]
97 } 97 }
98 }, 98 },
99 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], 99 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ],
100 }, 100 },
101 ], 101 ],
102 } 102 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698