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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 # open-vcdiff's logging.h introduces static initializers. This was | 58 # open-vcdiff's logging.h introduces static initializers. This was |
59 # reported upstream years ago ( | 59 # reported upstream years ago ( |
60 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since | 60 # https://code.google.com/p/open-vcdiff/issues/detail?id=33 ). Since |
61 # upstream won't fix this, work around it on the chromium side: | 61 # upstream won't fix this, work around it on the chromium side: |
62 # Inject a header that forwards to base/logging.h instead (which doesn't | 62 # Inject a header that forwards to base/logging.h instead (which doesn't |
63 # introduce static initializers, and which prevents open-vcdiff's | 63 # introduce static initializers, and which prevents open-vcdiff's |
64 # logging.h from being used). | 64 # logging.h from being used). |
65 logging_file = rebase_path("logging_forward.h", root_build_dir) | 65 logging_file = rebase_path("logging_forward.h", root_build_dir) |
66 if (is_win) { | 66 if (is_win) { |
67 cflags = [ | 67 cflags = [ |
68 "/FI", rebase_path("//build/intsafe_workaround.h", root_build_dir), | |
69 "/FI", logging_file, | 68 "/FI", logging_file, |
70 ] | 69 ] |
71 } else { | 70 } else { |
72 cflags = [ "-include", logging_file ] | 71 cflags = [ "-include", logging_file ] |
73 if (is_linux) { | 72 if (is_linux) { |
74 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: | 73 # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: |
75 cflags += [ "-Wno-deprecated-declarations" ] | 74 cflags += [ "-Wno-deprecated-declarations" ] |
76 } | 75 } |
77 } | 76 } |
78 } | 77 } |
OLD | NEW |