| OLD | NEW |
| 1 # | 1 # |
| 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], | 244 ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], |
| 245 ], | 245 ], |
| 246 # Disable c4267 warnings until we fix size_t to int truncations. | 246 # Disable c4267 warnings until we fix size_t to int truncations. |
| 247 # Disable c4724 warnings which is generated in VS2012 due to improper | 247 # Disable c4724 warnings which is generated in VS2012 due to improper |
| 248 # compiler optimizations, see crbug.com/237063 | 248 # compiler optimizations, see crbug.com/237063 |
| 249 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], | 249 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], |
| 250 'conditions': [ | 250 'conditions': [ |
| 251 ['OS=="linux" or OS=="android" or OS=="win"', { | 251 ['OS=="linux" or OS=="android" or OS=="win"', { |
| 252 'sources/': [ | 252 'sources/': [ |
| 253 # Cherry-pick files excluded by the broader regular expressions above. | 253 # Cherry-pick files excluded by the broader regular expressions above. |
| 254 ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], | |
| 255 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], | 254 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], |
| 256 ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'], | 255 ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'], |
| 257 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], | 256 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], |
| 258 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], | 257 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], |
| 259 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'], | 258 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'], |
| 260 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], | 259 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], |
| 261 ], | 260 ], |
| 262 'dependencies': [ | 261 'dependencies': [ |
| 263 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', | 262 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', |
| 264 ], | 263 ], |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 | 329 |
| 331 # The Mac currently uses FontCustomPlatformDataMac.cpp, | 330 # The Mac currently uses FontCustomPlatformDataMac.cpp, |
| 332 # included by regex above, instead. | 331 # included by regex above, instead. |
| 333 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], | 332 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], |
| 334 | 333 |
| 335 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], | 334 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], |
| 336 | 335 |
| 337 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], | 336 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], |
| 338 | 337 |
| 339 # Mac uses Harfbuzz. | 338 # Mac uses Harfbuzz. |
| 340 ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], | |
| 341 ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'], | 339 ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'], |
| 342 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], | 340 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], |
| 343 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], | 341 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], |
| 344 | 342 |
| 345 ['include', 'geometry/mac/FloatPointMac\\.mm$'], | 343 ['include', 'geometry/mac/FloatPointMac\\.mm$'], |
| 346 ['include', 'geometry/mac/FloatRectMac\\.mm$'], | 344 ['include', 'geometry/mac/FloatRectMac\\.mm$'], |
| 347 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], | 345 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], |
| 348 ['include', 'geometry/mac/IntPointMac\\.mm$'], | 346 ['include', 'geometry/mac/IntPointMac\\.mm$'], |
| 349 ['include', 'geometry/mac/IntRectMac\\.mm$'], | 347 ['include', 'geometry/mac/IntRectMac\\.mm$'], |
| 350 | 348 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 ['OS=="android"', { | 480 ['OS=="android"', { |
| 483 'cflags!': ['-mthumb'], | 481 'cflags!': ['-mthumb'], |
| 484 }], | 482 }], |
| 485 ], | 483 ], |
| 486 },{ # target_arch!="arm" | 484 },{ # target_arch!="arm" |
| 487 'type': 'none', | 485 'type': 'none', |
| 488 }], | 486 }], |
| 489 ], | 487 ], |
| 490 }], | 488 }], |
| 491 } | 489 } |
| OLD | NEW |