Bug 880419: make sure that NEON detection is on for B2G libyuv; build on Android ARMv6 r=glandium

(This works around the fact that we define HAVE_ARM_NEON on ARMv6 processors)

build/gyp.mozbuild

@@ -30,6 +30,7 @@ gyp_vars = {
 
      # turn off mandatory use of NEON and instead use NEON detection
     'arm_neon': 0,
+    'arm_neon_optional': 1,
 
     'moz_widget_toolkit_gonk': 0,
 
@@ -92,6 +93,7 @@ gyp_vars['target_arch'] = arches[CONFIG['CPU_ARCH']]
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:
         gyp_vars['armv7'] = 0
+        gyp_vars['arm_neon_optional'] = 0
     elif os == 'Android':
         gyp_vars['armv7'] = 1
     else:

media/libyuv/libyuv.gyp

@@ -38,9 +38,18 @@
             '-mfpu=vfpv3',
             '-mfpu=vfpv3-d16',
           ],
+          # XXX Doesn't work currently
+          'cflags_mozilla!': [
+            '-mfpu=vfp',
+            '-mfpu=vfpv3',
+            '-mfpu=vfpv3-d16',
+          ],
           'cflags': [
             '-mfpu=neon',
           ],
+          'cflags_mozilla': [
+            '-mfpu=neon',
+          ],
           'include_dirs': [
             'include',
             '.',

media/libyuv/moz.build

@@ -19,4 +19,3 @@ GYP_DIRS['.'].input = 'libyuv.gyp'
 GYP_DIRS['.'].variables = gyp_vars
 GYP_DIRS['.'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
 GYP_DIRS['.'].non_unified_sources += libyuv_non_unified_sources
-

media/webrtc/signaling/test/Makefile.in

@@ -18,6 +18,10 @@ LIBS = \
   $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \
   $(NULL)
 
+ifdef BUILD_ARM_NEON
+LIBS += $(DEPTH)/media/libyuv/libyuv_libyuv_neon/$(LIB_PREFIX)yuv_neon.$(LIB_SUFFIX)
+endif
+
 ifdef JS_SHARED_LIBRARY
 LIBS += $(MOZ_JS_LIBS)
 endif