OLD | NEW |
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 'include_dirs': [ | 51 'include_dirs': [ |
52 'open-vcdiff/src', | 52 'open-vcdiff/src', |
53 ], | 53 ], |
54 }, | 54 }, |
55 'conditions': [ | 55 'conditions': [ |
56 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], | 56 [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], |
57 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], | 57 [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], |
58 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], | 58 [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], |
59 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], | 59 [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], |
60 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], | 60 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], |
61 # TODO(mark): Remove usage of the deprecated auto_ptr. | |
62 [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ], | |
63 ], | 61 ], |
64 # open-vcdiff's logging.h introduces static initializers. This was | 62 # open-vcdiff's logging.h introduces static initializers. This was |
65 # reported upstream years ago ( | 63 # reported upstream years ago ( |
66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since | 64 # 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: | 65 # 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 | 66 # Inject a header that forwards to base/logging.h instead (which doesn't |
69 # introduce static initializers, and which prevents open-vcdiff's | 67 # introduce static initializers, and which prevents open-vcdiff's |
70 # logging.h from being used). | 68 # logging.h from being used). |
71 'variables': { | 69 'variables': { |
72 'logging_path': 'logging_forward.h', | 70 'logging_path': 'logging_forward.h', |
(...skipping 16 matching lines...) Expand all Loading... |
89 '<(DEPTH)/build', | 87 '<(DEPTH)/build', |
90 ], | 88 ], |
91 'msvs_settings': { | 89 'msvs_settings': { |
92 'VCCLCompilerTool': { | 90 'VCCLCompilerTool': { |
93 'ForcedIncludeFiles': [ | 91 'ForcedIncludeFiles': [ |
94 'intsafe_workaround.h', # http://crbug.com/308740 | 92 'intsafe_workaround.h', # http://crbug.com/308740 |
95 'sdch/<(logging_path)', | 93 'sdch/<(logging_path)', |
96 ] | 94 ] |
97 } | 95 } |
98 }, | 96 }, |
99 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], | 97 'cflags': [ |
| 98 '-include', '<(logging_dir)/sdch/<(logging_path)', |
| 99 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: |
| 100 '-Wno-deprecated-declarations', |
| 101 ], |
100 }, | 102 }, |
101 ], | 103 ], |
102 } | 104 } |
OLD | NEW |