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
markYoungH · Aug 4, 2014 · 576f60d · 576f60d
1 parent 4d1293d
commit 576f60d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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',
       ],
     }],
   ],