Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Side by Side Diff: Source/WebCore/WebCore.gyp/WebCore.gyp

Issue 9801010: Merge 110541 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 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 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 ['exclude', 'platform/MIMETypeRegistry\\.cpp$'], 1462 ['exclude', 'platform/MIMETypeRegistry\\.cpp$'],
1463 ['exclude', 'platform/Theme\\.cpp$'], 1463 ['exclude', 'platform/Theme\\.cpp$'],
1464 ['exclude', 'platform/graphics/ANGLEWebKitBridge\\.(cpp|h)$'], 1464 ['exclude', 'platform/graphics/ANGLEWebKitBridge\\.(cpp|h)$'],
1465 # *NEON.cpp files need special compile options. 1465 # *NEON.cpp files need special compile options.
1466 # They are moved to the webcore_arm_neon target. 1466 # They are moved to the webcore_arm_neon target.
1467 ['exclude', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'], 1467 ['exclude', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'],
1468 ['exclude', 'platform/image-encoders/JPEGImageEncoder\\.(cpp|h)$'], 1468 ['exclude', 'platform/image-encoders/JPEGImageEncoder\\.(cpp|h)$'],
1469 ['exclude', 'platform/image-encoders/PNGImageEncoder\\.(cpp|h)$'], 1469 ['exclude', 'platform/image-encoders/PNGImageEncoder\\.(cpp|h)$'],
1470 ['exclude', 'platform/network/ResourceHandle\\.cpp$'], 1470 ['exclude', 'platform/network/ResourceHandle\\.cpp$'],
1471 ['exclude', 'platform/sql/SQLiteFileSystem\\.cpp$'], 1471 ['exclude', 'platform/sql/SQLiteFileSystem\\.cpp$'],
1472 ['exclude', 'platform/text/LocaleToScriptMappingDefault\\.cpp$'], 1472 ['exclude', 'platform/text/LocaleToScriptMappingICU\\.cpp$'],
1473 ['exclude', 'platform/text/LocalizedNumberNone\\.cpp$'], 1473 ['exclude', 'platform/text/LocalizedNumberNone\\.cpp$'],
1474 ['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'], 1474 ['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
1475 ], 1475 ],
1476 'conditions': [ 1476 'conditions': [
1477 ['use_x11 == 1', { 1477 ['use_x11 == 1', {
1478 'sources/': [ 1478 'sources/': [
1479 # Cherry-pick files excluded by the broader regular expressions abov e. 1479 # Cherry-pick files excluded by the broader regular expressions abov e.
1480 ['include', 'platform/graphics/harfbuzz/ComplexTextControllerHarfBuz z\\.cpp$'], 1480 ['include', 'platform/graphics/harfbuzz/ComplexTextControllerHarfBuz z\\.cpp$'],
1481 ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'], 1481 ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
1482 ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.c pp$'], 1482 ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.c pp$'],
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h', 2022 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8Internals.h',
2023 '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettings.cpp', 2023 '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/V8InternalSettings.cpp',
2024 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h', 2024 '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/V8InternalSettings.h',
2025 ], 2025 ],
2026 'sources/': [ 2026 'sources/': [
2027 ['exclude', 'testing/js'], 2027 ['exclude', 'testing/js'],
2028 ], 2028 ],
2029 }, 2029 },
2030 ], # targets 2030 ], # targets
2031 } 2031 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698