~osomon/oxide/fix-crash-popup-menu

« back to all changes in this revision

Viewing changes to patches/arm-neon.patch

  • Committer: Chris Coulson
  • Date: 2015-04-17 20:22:43 UTC
  • mfrom: (640.1.244 canary)
  • Revision ID: chris.coulson@canonical.com-20150417202243-a5dz76gwj6hdqmw2
Bump Chromium rev to 44.0.2369.0 and Qt version to 1.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Description: Fix build on non-Android ARM Linux builds without NEON.
2
 
#  - The common.gypi change allows us to disable NEON runtime detection with
3
 
#    (arm_neon==0 and arm_neon_optional==0) builds
4
 
#  - The sinc_resampler.cc changes add support for a mode where there is no
5
 
#    NEON support
6
 
#  - The isacfix.gypi changes fix the isac_neon target to not assume that
7
 
#    arm_version==7 means there is NEON support. This prevents a problem where
8
 
#    various lookup tables are defined twice (causing a link failure) with
9
 
#    (arm_neon==0 and arm_neon_optional==0 and arm_version==7) builds - once
10
 
#    in transform_neon.S (which shouldn't be built) and also in
11
 
#    transform_tables.c - with the latter being ifdef'd in correctly only when
12
 
#    both WEBRTC_ARCH_ARM_NEON and WEBRTC_DETECT_ARM_NEON aren't defined
13
 
# Author: Chris Coulson <chris.coulson@canonical.com>
14
 
 
15
 
diff --git a/third_party/webrtc/build/common.gypi b/third_party/webrtc/build/common.gypi
16
 
--- a/third_party/webrtc/build/common.gypi
17
 
+++ b/third_party/webrtc/build/common.gypi
18
 
@@ -271,17 +271,17 @@
19
 
         ],
20
 
         'conditions': [
21
 
           ['arm_version>=7', {
22
 
             'defines': ['WEBRTC_ARCH_ARM_V7',],
23
 
             'conditions': [
24
 
               ['arm_neon==1', {
25
 
                 'defines': ['WEBRTC_ARCH_ARM_NEON',],
26
 
               }],
27
 
-              ['arm_neon==0 and OS=="android"', {
28
 
+              ['arm_neon==0 and (OS=="android" or arm_neon_optional==1)', {
29
 
                 'defines': ['WEBRTC_DETECT_ARM_NEON',],
30
 
               }],
31
 
             ],
32
 
           }],
33
 
         ],
34
 
       }],
35
 
       ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
36
 
         'defines': [