| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], | 64 [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], |
| 65 ], | 65 ], |
| 66 # open-vcdiff's logging.h introduces static initializers. This was | 66 # open-vcdiff's logging.h introduces static initializers. This was |
| 67 # reported upstream years ago ( | 67 # reported upstream years ago ( |
| 68 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since | 68 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since |
| 69 # upstream won't fix this, work around it on the chromium side: | 69 # upstream won't fix this, work around it on the chromium side: |
| 70 # Inject a header that forwards to base/logging.h instead (which doesn't | 70 # Inject a header that forwards to base/logging.h instead (which doesn't |
| 71 # introduce static initializers, and which prevents open-vcdiff's | 71 # introduce static initializers, and which prevents open-vcdiff's |
| 72 # logging.h from being used). | 72 # logging.h from being used). |
| 73 'variables': { | 73 'variables': { |
| 74 'clang_warning_flags': [ |
| 75 # sdch uses the pre-c++11 typedef-as-static_assert hack. |
| 76 # https://code.google.com/p/open-vcdiff/issues/detail?id=44 |
| 77 '-Wno-unused-local-typedef', |
| 78 ], |
| 74 'logging_path': 'logging_forward.h', | 79 'logging_path': 'logging_forward.h', |
| 75 'conditions': [ | 80 'conditions': [ |
| 76 # gyp leaves unspecified what the cwd is when running the compiler, | 81 # gyp leaves unspecified what the cwd is when running the compiler, |
| 77 # and gyp/linux doesn't have a built-in way for forcing an include. | 82 # and gyp/linux doesn't have a built-in way for forcing an include. |
| 78 # So hardcode the base directory. If this spreads, provide native | 83 # So hardcode the base directory. If this spreads, provide native |
| 79 # support in gyp, like we have for gyp/mac and gyp/windows. | 84 # support in gyp, like we have for gyp/mac and gyp/windows. |
| 80 # path. | 85 # path. |
| 81 ['"<(GENERATOR)"=="ninja"', { 'logging_dir': '../..' }, | 86 ['"<(GENERATOR)"=="ninja"', { 'logging_dir': '../..' }, |
| 82 { 'logging_dir': '.' } | 87 { 'logging_dir': '.' } |
| 83 ], | 88 ], |
| (...skipping 11 matching lines...) Expand all Loading... |
| 95 } | 100 } |
| 96 }, | 101 }, |
| 97 'cflags': [ | 102 'cflags': [ |
| 98 '-include', '<(logging_dir)/sdch/<(logging_path)', | 103 '-include', '<(logging_dir)/sdch/<(logging_path)', |
| 99 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: | 104 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: |
| 100 '-Wno-deprecated-declarations', | 105 '-Wno-deprecated-declarations', |
| 101 ], | 106 ], |
| 102 }, | 107 }, |
| 103 ], | 108 ], |
| 104 } | 109 } |
| OLD | NEW |