When NEON disabled, always build ARM memset routines.

Fixes: ...SkUtils_opts_arm.cpp:36:error: undefined reference to 'arm_memset16' ...SkUtils_opts_arm.cpp:53:error: undefined reference to 'arm_memset32' BUG=155921,277433 TEST=Fixes missing memset routine during linking. R=mtklein@google.com, reed@google.com Review URL: https://codereview.chromium.org/391793002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283220 0039d316-1c4b-4281-b951-d872f2087c98
hexiaoyuan · Jul 15, 2014 · f7bc144 · f7bc144
1 parent ea267a2
commit f7bc144
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
@@ -631,7 +631,7 @@ source_set("skia_opts") {
     }
 
     # Non-Neon ARM code.
-    if (arm_version < 7 || (!arm_use_neon && arm_optionally_use_neon)) {
+    if (arm_version < 7 || !arm_use_neon) {
       sources += [ "//third_party/skia/src/opts/memset.arm.S" ]
     }
 

diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
@@ -102,7 +102,7 @@
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
           ],
         }],
-        [ 'target_arch == "arm" and (arm_version < 7 or (arm_neon == 0 and arm_neon_optional == 1))', {
+        [ 'target_arch == "arm" and (arm_version < 7 or arm_neon == 0)', {
           'sources': [
             '../third_party/skia/src/opts/memset.arm.S',
           ],