| 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 # TODO: This file was copied from the external dependency | 5 # TODO: This file was copied from the external dependency |
| 6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, | 6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, |
| 7 # with directory paths modified to work at this level. | 7 # with directory paths modified to work at this level. |
| 8 # | 8 # |
| 9 # It would be better for us to depend on that gypfile within the external | 9 # It would be better for us to depend on that gypfile within the external |
| 10 # dependency, but so far we have been unable to make that work reliably. | 10 # dependency, but so far we have been unable to make that work reliably. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 '../third_party/externals/jsoncpp-chromium/overrides/include/', | 42 '../third_party/externals/jsoncpp-chromium/overrides/include/', |
| 43 '../third_party/externals/jsoncpp/include/', | 43 '../third_party/externals/jsoncpp/include/', |
| 44 '../third_party/externals/jsoncpp/src/lib_json/', | 44 '../third_party/externals/jsoncpp/src/lib_json/', |
| 45 ], | 45 ], |
| 46 'direct_dependent_settings': { | 46 'direct_dependent_settings': { |
| 47 'include_dirs': [ | 47 'include_dirs': [ |
| 48 '../third_party/externals/jsoncpp-chromium/overrides/include/', | 48 '../third_party/externals/jsoncpp-chromium/overrides/include/', |
| 49 '../third_party/externals/jsoncpp/include/', | 49 '../third_party/externals/jsoncpp/include/', |
| 50 ], | 50 ], |
| 51 }, | 51 }, |
| 52 'conditions': [ | 52 'cflags': [ |
| 53 [ 'skia_os == "android"', { | 53 '-w', |
| 54 'cflags!': [ | |
| 55 '-Wall', | |
| 56 ], | |
| 57 }], | |
| 58 ], | 54 ], |
| 59 }, | 55 }, |
| 60 ], | 56 ], |
| 61 } | 57 } |
| 62 | 58 |
| 63 # Local Variables: | 59 # Local Variables: |
| 64 # tab-width:2 | 60 # tab-width:2 |
| 65 # indent-tabs-mode:nil | 61 # indent-tabs-mode:nil |
| 66 # End: | 62 # End: |
| 67 # vim: set expandtab tabstop=2 shiftwidth=2: | 63 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |