| 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': [ 'open-vcdiff/vsprojects' ] } ], | 60 [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], |
| 61 # TODO(mark): Remove usage of the deprecated auto_ptr. | 61 ['clang==1', { |
| 62 [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ], | 62 # open-vcdiff uses intentional fallthroughs. |
| 63 'xcode_settings': { 'WARNING_CFLAGS!': [ '-Wimplicit-fallthrough' ] }, |
| 64 'cflags!': [ '-Wimplicit-fallthrough' ], |
| 65 # TODO(mark): Remove usage of the deprecated auto_ptr. |
| 66 'cflags': [ '-Wno-deprecated-declarations' ] } |
| 67 }], |
| 63 ], | 68 ], |
| 64 # open-vcdiff's logging.h introduces static initializers. This was | 69 # open-vcdiff's logging.h introduces static initializers. This was |
| 65 # reported upstream years ago ( | 70 # reported upstream years ago ( |
| 66 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since | 71 # 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: | 72 # 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 | 73 # Inject a header that forwards to base/logging.h instead (which doesn't |
| 69 # introduce static initializers, and which prevents open-vcdiff's | 74 # introduce static initializers, and which prevents open-vcdiff's |
| 70 # logging.h from being used). | 75 # logging.h from being used). |
| 71 'variables': { | 76 'variables': { |
| 72 'logging_path': 'logging_forward.h', | 77 'logging_path': 'logging_forward.h', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 85 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the | 90 # ForcedIncludeFiles is relative to include_dirs, cflags relative to the |
| 86 # build directory. | 91 # build directory. |
| 87 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, | 92 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, |
| 88 'msvs_settings': { | 93 'msvs_settings': { |
| 89 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] } | 94 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] } |
| 90 }, | 95 }, |
| 91 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], | 96 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], |
| 92 }, | 97 }, |
| 93 ], | 98 ], |
| 94 } | 99 } |
| OLD | NEW |