vpx: Simplify intrinsic gypi files.

generate_gypi.sh

 #!/bin/bash -e
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is used to generate .gypi files and files in the config/platform
 # directories needed to build libvpx.
 # Every time libvpx source code is updated just run this script.
 #
@@ skipping 60 matching lines @@
   echo "      'include_dirs': [" >> $2
   echo "        'source/config/<(OS_CATEGORY)/<(target_arch_full)'," >> $2
   echo "        '<(libvpx_source)'," >> $2
   echo "      ]," >> $2
   echo "      'sources': [" >> $2
   for f in $sources_list
   do
     echo "        '<(libvpx_source)/$f'," >> $2
   done
   echo "      ]," >> $2
-  echo "      'conditions': [" >> $2
-  echo "        ['os_posix==1 and OS!=\"mac\" and OS!=\"ios\"', {" >> $2
-  echo "          'cflags!': [ '-mfpu=vfpv3-d16' ]," >> $2
-  echo "          'cflags': [ '-m$4', ]," >> $2
-  echo "        }]," >> $2
-  echo "        ['OS==\"mac\" or OS==\"ios\"', {" >> $2
-  echo "          'xcode_settings': {" >> $2
-  echo "            'OTHER_CFLAGS': [ '-m$4', ]," >> $2
-  echo "          }," >> $2
-  echo "        }]," >> $2
+  if [[ $4 == fpu=neon ]]; then
+  echo "      'cflags!': [ '-mfpu=vfpv3-d16' ]," >> $2
+  fi
+  echo "      'cflags': [ '-m$4', ]," >> $2
+  echo "      'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> $2
   if [[ $4 == avx* ]]; then
-  echo "        ['OS==\"win\"', {" >> $2
-  echo "          'msvs_settings': {" >> $2
-  echo "            'VCCLCompilerTool': {" >> $2
-  echo "              'EnableEnhancedInstructionSet': '3', # /arch:AVX" >> $2
-  echo "            }," >> $2
-  echo "          }," >> $2
-  echo "        }]," >> $2
+  echo "      'msvs_settings': {" >> $2
+  echo "        'VCCLCompilerTool': {" >> $2
+  echo "          'EnableEnhancedInstructionSet': '3', # /arch:AVX" >> $2
+  echo "        }," >> $2
+  echo "      }," >> $2
   fi
-  echo "      ]," >> $2
   echo "    }," >> $2
 }
 
 
 # Generate a gypi which applies additional compiler flags based on the file
 # name.
 # $1 - Array name for file list.
 # $2 - Output file
 function write_special_flags {
   declare -a file_list=("${!1}")
@@ skipping 332 matching lines @@
 make_clean
 make libvpx_srcs.txt target=libs $config > /dev/null
 convert_srcs_to_gypi libvpx_srcs.txt libvpx_srcs_generic
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
 
 # TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel?
 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?