| 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 'includes': [ | 6 'includes': [ |
| 7 'common_variables.gypi', | 7 'common_variables.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'component%': 'static_library', | 10 'component%': 'static_library', |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 ], | 113 ], |
| 114 [ | 114 [ |
| 115 'skia_os in ["linux", "chromeos"]', { | 115 'skia_os in ["linux", "chromeos"]', { |
| 116 'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ], | 116 'sources': [ '<(icu_directory)/linux/icudtl_dat.S', ], |
| 117 } | 117 } |
| 118 ], | 118 ], |
| 119 [ | 119 [ |
| 120 'skia_os == "mac"', { | 120 'skia_os == "mac"', { |
| 121 'sources': [ '<(icu_directory)/mac/icudtl_dat.S', ], | 121 'sources': [ '<(icu_directory)/mac/icudtl_dat.S', ], |
| 122 'xcode_settings': { | 122 'xcode_settings': { |
| 123 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti | 123 'OTHER_CPLUSPLUSFLAGS': [ '-frtti' ], |
| 124 'WARNING_CFLAGS': [ '-w' ], | 124 'WARNING_CFLAGS': [ '-w' ], |
| 125 }, | 125 }, |
| 126 } | 126 } |
| 127 ], | 127 ], |
| 128 ], # conditions | 128 ], # conditions |
| 129 }, | 129 }, |
| 130 ], # targets | 130 ], # targets |
| 131 } | 131 } |
| OLD | NEW |