Fix arm/LTO build by moving neon asm files to intrinsics target.

libvpx.gyp

 # 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.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     # Disable LTO for neon targets
     # crbug.com/408997
     'use_lto%': 0,
@@ skipping 207 matching lines @@
     ],
     # 'libvpx' target for ARM builds.
     [ '(target_arch=="arm" or target_arch=="armv7") ', {
       'targets': [
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
           'target_name': 'libvpx',
           'type': 'static_library',
 
-          # Copy the script to the output folder so that we can use it with
-          # absolute path.
-          'copies': [{
-            'destination': '<(shared_generated_dir)',
-            'files': [
-              '<(ads2gas_script_path)',
-              '<(ads2gas_script_include)',
-            ],
-          }],
+          'includes': [ 'ads2gas.gypi', ],
 
-          # Rule to convert .asm files to .S files.
-          'rules': [
-            {
-              'rule_name': 'convert_asm',
-              'extension': 'asm',
-              'inputs': [
-                '<(shared_generated_dir)/<(ads2gas_script)',
-                '<(shared_generated_dir)/thumb.pm',
-              ],
-              'outputs': [
-                '<(shared_generated_dir)/<(RULE_INPUT_ROOT).S',
-              ],
-              'action': [
-                'bash',
-                '-c',
-                'cat <(RULE_INPUT_PATH) | perl <(shared_generated_dir)/<(ads2gas_script) -chromium > <(shared_generated_dir)/<(RULE_INPUT_ROOT).S',
-              ],
-              'process_outputs_as_sources': 1,
-              'message': 'Convert libvpx asm file for ARM <(RULE_INPUT_PATH)',
-            },
-          ],
-
-          'variables': {
-            'variables': {
-              'conditions': [
-                ['OS=="ios"', {
-                  'ads2gas_script%': 'ads2gas_apple.pl',
-                }, {
-                  'ads2gas_script%': 'ads2gas.pl',
-                }],
-              ],
-            },
-            'ads2gas_script%': '<(ads2gas_script)',
-            # Location of the assembly conversion script.
-            'ads2gas_script_path': '<(libvpx_source)/build/make/<(ads2gas_script)',
-            'ads2gas_script_include': '<(libvpx_source)/build/make/thumb.pm',
-          },
           'xcode_settings': {
             'OTHER_CFLAGS': [
               '-I<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
               '-I<!(pwd)/source/config',
               '-I<(shared_generated_dir)',
             ],
           },
           'include_dirs': [
             'source/config/<(OS_CATEGORY)/<(target_arch_full)',
             'source/config',
             '<(libvpx_source)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(libvpx_source)',
             ],
           },
           'conditions': [
             # Libvpx optimizations for ARMv6 or ARMv7 without NEON.
             ['arm_neon==0', {
               'conditions': [
                 ['OS=="android"', {
                   'includes': [
                     'libvpx_srcs_arm_neon_cpu_detect.gypi',
                   ],
                   'dependencies': [
                     'libvpx_intrinsics_neon',
                   ],
-                  'cflags': [
-                    '-Wa,-mfpu=neon',
-                  ],
                 }, {
                   'includes': [
                     'libvpx_srcs_arm.gypi',
                   ],
                 }],
               ],
             }],
             # Libvpx optimizations for ARMv7 with NEON.
             ['arm_neon==1', {
               'includes': [
@@ skipping 12 matching lines @@
                   '-fstack-protector-all',  # Implies -fstack-protector
                 ],
               },
             }],
           ],
         },
       ],
     }],
   ],
 }