diff options
| author | djsollen@google.com <djsollen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 15:25:11 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 15:25:11 +0000 |
| commit | 576f60dccaac651c82aa7958b65cca97359990cf (patch) | |
| tree | 286d8e5abd8595b12d44d3f81b9a99ed709b3f89 /skia | |
| parent | 4d1293dc2a78b1e913d0eaedb3081b304817e05f (diff) | |
| download | chromium_src-576f60dccaac651c82aa7958b65cca97359990cf.zip chromium_src-576f60dccaac651c82aa7958b65cca97359990cf.tar.gz chromium_src-576f60dccaac651c82aa7958b65cca97359990cf.tar.bz2 | |
Remove old style NEON defines now that Skia has been updated
BUG=skia:2785
Review URL: https://codereview.chromium.org/435963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 4 | ||||
| -rw-r--r-- | skia/skia_common.gypi | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index ac61739..40ef810 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -180,10 +180,10 @@ config("skia_library_config") { if (cpu_arch == "arm") { if (arm_use_neon) { - defines += [ "SK_ARM_HAS_NEON", "__ARM_HAVE_NEON" ] + defines += [ "SK_ARM_HAS_NEON" ] } if (arm_optionally_use_neon) { - defines += [ "SK_ARM_HAS_OPTIONAL_NEON", "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ] + defines += [ "SK_ARM_HAS_OPTIONAL_NEON" ] } } diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 2d89b4c..5c5b3fe7 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -112,13 +112,11 @@ [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', { 'defines': [ 'SK_ARM_HAS_NEON', - '__ARM_HAVE_NEON', ], }], [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', { 'defines': [ 'SK_ARM_HAS_OPTIONAL_NEON', - '__ARM_HAVE_OPTIONAL_NEON_SUPPORT', ], }], ], |