| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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("snappy_config") { | 5 config("snappy_config") { | 
| 6   include_dirs = [ "src" ] | 6   include_dirs = [ "src" ] | 
| 7 | 7 | 
| 8   # These OS-specific generated headers were made by running the configure | 8   # These OS-specific generated headers were made by running the configure | 
| 9   # script offline. | 9   # script offline. | 
| 10   if (is_win) { | 10   if (is_win) { | 
| 11     include_dirs += [ "win32" ] | 11     include_dirs += [ "win32" ] | 
| 12   } else if (is_mac) { | 12   } else if (is_mac) { | 
| 13     include_dirs += [ "mac" ] | 13     include_dirs += [ "mac" ] | 
| 14   } else { | 14   } else { | 
| 15     include_dirs += [ "linux" ] | 15     include_dirs += [ "linux" ] | 
| 16   } | 16   } | 
| 17 } | 17 } | 
| 18 | 18 | 
|  | 19 config("snappy_warnings") { | 
|  | 20   if (is_clang) { | 
|  | 21     # ComputeTable is unused, | 
|  | 22     # https://code.google.com/p/snappy/issues/detail?id=96 | 
|  | 23     cflags = [ "-Wno-unused-function" ] | 
|  | 24   } | 
|  | 25 } | 
|  | 26 | 
| 19 static_library("snappy") { | 27 static_library("snappy") { | 
| 20   sources = [ | 28   sources = [ | 
| 21     "src/snappy-internal.h", | 29     "src/snappy-internal.h", | 
| 22     "src/snappy-sinksource.cc", | 30     "src/snappy-sinksource.cc", | 
| 23     "src/snappy-sinksource.h", | 31     "src/snappy-sinksource.h", | 
| 24     "src/snappy-stubs-internal.cc", | 32     "src/snappy-stubs-internal.cc", | 
| 25     "src/snappy-stubs-internal.h", | 33     "src/snappy-stubs-internal.h", | 
| 26     "src/snappy.cc", | 34     "src/snappy.cc", | 
| 27     "src/snappy.h", | 35     "src/snappy.h", | 
| 28   ] | 36   ] | 
| 29 | 37 | 
| 30   config("snappy_warnings") { |  | 
| 31     if (is_clang) { |  | 
| 32       # ComputeTable is unused, |  | 
| 33       # https://code.google.com/p/snappy/issues/detail?id=96 |  | 
| 34       cflags = [ "-Wno-unused-function" ] |  | 
| 35     } |  | 
| 36   } |  | 
| 37   configs -= [ "//build/config/compiler:chromium_code" ] | 38   configs -= [ "//build/config/compiler:chromium_code" ] | 
| 38   configs += [ "//build/config/compiler:no_chromium_code" ] | 39   configs += [ | 
| 39   configs += [ ":snappy_warnings" ] | 40     "//build/config/compiler:no_chromium_code", | 
|  | 41 | 
|  | 42     # Must be after no_chromium_code for warning flags to be ordered correctly. | 
|  | 43     ":snappy_warnings", | 
|  | 44   ] | 
| 40   public_configs = [ ":snappy_config" ] | 45   public_configs = [ ":snappy_config" ] | 
| 41 | 46 | 
| 42   if (is_win) { | 47   if (is_win) { | 
| 43     cflags = [ "/wd4018" ]  # Signed/unsigned mismatch in comparison. | 48     cflags = [ "/wd4018" ]  # Signed/unsigned mismatch in comparison. | 
| 44   } | 49   } | 
| 45 | 50 | 
| 46   if (is_clang) { | 51   if (is_clang) { | 
| 47     # snappy-stubs-internal.h unapologetically has: using namespace std | 52     # snappy-stubs-internal.h unapologetically has: using namespace std | 
| 48     # https://code.google.com/p/snappy/issues/detail?id=70 | 53     # https://code.google.com/p/snappy/issues/detail?id=70 | 
| 49     configs -= [ "//build/config/clang:extra_warnings" ] | 54     configs -= [ "//build/config/clang:extra_warnings" ] | 
| 50   } | 55   } | 
| 51 } | 56 } | 
| OLD | NEW | 
|---|