OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 config("sdch_config") { | 5 config("sdch_config") { |
6 include_dirs = [ "open-vcdiff/src" ] | 6 include_dirs = [ "open-vcdiff/src" ] |
7 } | 7 } |
8 | 8 |
9 static_library("sdch") { | 9 static_library("sdch") { |
10 sources = [ | 10 sources = [ |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 # open-vcdiff's logging.h introduces static initializers. This was | 76 # open-vcdiff's logging.h introduces static initializers. This was |
77 # reported upstream years ago ( | 77 # reported upstream years ago ( |
78 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since | 78 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since |
79 # upstream won't fix this, work around it on the chromium side: | 79 # upstream won't fix this, work around it on the chromium side: |
80 # Inject a header that forwards to base/logging.h instead (which doesn't | 80 # Inject a header that forwards to base/logging.h instead (which doesn't |
81 # introduce static initializers, and which prevents open-vcdiff's | 81 # introduce static initializers, and which prevents open-vcdiff's |
82 # logging.h from being used). | 82 # logging.h from being used). |
83 if (is_win) { | 83 if (is_win) { |
84 cflags = [ | 84 cflags = [ |
85 "/FI", "sdch/logging_forward.h", | 85 "/FI", |
| 86 "sdch/logging_forward.h", |
86 ] | 87 ] |
87 } else { | 88 } else { |
88 logging_file = rebase_path("logging_forward.h", root_build_dir) | 89 logging_file = rebase_path("logging_forward.h", root_build_dir) |
89 cflags = [ "-include", logging_file ] | 90 cflags = [ |
| 91 "-include", |
| 92 logging_file, |
| 93 ] |
90 } | 94 } |
91 } | 95 } |
OLD | NEW |