vpx: Simplify intrinsic gypi files.

generate_gypi.sh

Index: generate_gypi.sh
diff --git a/generate_gypi.sh b/generate_gypi.sh
index caaa523f786a63dede3dcb93cb78754e6b90bb87..09255f193793393ab82ff6b16b75def9dd4d8ee3 100755
--- a/generate_gypi.sh
+++ b/generate_gypi.sh
@@ -78,26 +78,18 @@ function write_target_definition {
     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
 }