Changeset 110251 in webkit


Ignore:
Timestamp:
Mar 8, 2012 7:21:02 PM (12 years ago)
Author:
thakis@chromium.org
Message:

[chromium] Only build NEON files if target_arch=="arm"
https://bugs.webkit.org/show_bug.cgi?id=80626

Currently, webcore_arm_neon will compile a bunch of files
whose contents are completely ifdef'd away on non-arm, and
then bundle all the generated empty .o files into a useless
libwebcore_arm_neon.a. Don't do this.

Reviewed by Tony Chang.

  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r110249 r110251  
     12012-03-08  Nico Weber  <thakis@chromium.org>
     2
     3        [chromium] Only build NEON files if target_arch=="arm"
     4        https://bugs.webkit.org/show_bug.cgi?id=80626
     5
     6        Currently, webcore_arm_neon will compile a bunch of files
     7        whose contents are completely ifdef'd away on non-arm, and
     8        then bundle all the generated empty .o files into a useless
     9        libwebcore_arm_neon.a. Don't do this.
     10
     11        Reviewed by Tony Chang.
     12
     13        * WebCore.gyp/WebCore.gyp:
     14        * WebCore.gypi:
     15
    1162012-03-08 Nima Ghanavatian <nghanavatian@rim.com>
    217
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r110056 r110251  
    16751675    {
    16761676      'target_name': 'webcore_arm_neon',
    1677       'type': 'static_library',
    1678       'dependencies': [
    1679         'webcore_prerequisites',
    1680       ],
    1681       'hard_dependency': 1,
    1682       'sources': [
    1683         '<@(webcore_files)',
    1684       ],
    1685       'sources/': [
    1686         ['exclude', '.*'],
    1687         ['include', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'],
    1688       ],
    16891677      'conditions': [
    1690         ['OS=="android"', {
    1691           'cflags!': ['-mthumb'],
     1678        ['target_arch=="arm"', {
     1679          'type': 'static_library',
     1680          'dependencies': [
     1681            'webcore_prerequisites',
     1682          ],
     1683          'hard_dependency': 1,
     1684          'sources': [
     1685            '<@(webcore_files)',
     1686          ],
     1687          'sources/': [
     1688            ['exclude', '.*'],
     1689            ['include', 'platform/graphics/filters/arm/.*NEON\\.(cpp|h)'],
     1690          ],
    16921691          'cflags': ['-marm'],
    1693         }],
    1694         ['OS=="linux" and target_arch=="arm"', {
    1695           'cflags': ['-marm'],
     1692          'conditions': [
     1693            ['OS=="android"', {
     1694              'cflags!': ['-mthumb'],
     1695            }],
     1696          ],
     1697        },{  # target_arch!="arm"
     1698          'type': 'none',
    16961699        }],
    16971700      ],
Note: See TracChangeset for help on using the changeset viewer.