Add a [rtc_]build_with_neon variable to unify conditions.

webrtc/common_audio/common_audio.gyp

 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [
@@ skipping 118 matching lines @@
           'defines': ['RTC_USE_OPENMAX_DL',],
           'conditions': [
             ['build_openmax_dl==1', {
               'dependencies': ['<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',],
             }],
           ],
         }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': ['common_audio_sse2',],
         }],
+        ['build_with_neon==1', {
+          'dependencies': ['common_audio_neon',],
+        }],
         ['target_arch=="arm"', {
           'sources': [
             'signal_processing/complex_bit_reverse_arm.S',
             'signal_processing/spl_sqrt_floor_arm.S',
           ],
           'sources!': [
             'signal_processing/complex_bit_reverse.c',
             'signal_processing/spl_sqrt_floor.c',
           ],
           'conditions': [
             ['arm_version>=7', {
-              'dependencies': ['common_audio_neon',],
               'sources': [
                 'signal_processing/filter_ar_fast_q12_armv7.S',
               ],
               'sources!': [
                 'signal_processing/filter_ar_fast_q12.c',
               ],
             }],
           ],  # conditions
         }],
-        ['target_arch=="arm64"', {
-          'dependencies': ['common_audio_neon',],
-        }],
         ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
           'sources': [
             'signal_processing/include/spl_inl_mips.h',
             'signal_processing/complex_bit_reverse_mips.c',
             'signal_processing/complex_fft_mips.c',
             'signal_processing/cross_correlation_mips.c',
             'signal_processing/downsample_fast_mips.c',
             'signal_processing/filter_ar_fast_q12_mips.c',
             'signal_processing/min_max_operations_mips.c',
             'signal_processing/resample_by_2_mips.c',
@@ skipping 32 matching lines @@
             ['os_posix==1', {
               'cflags': [ '-msse2', ],
               'xcode_settings': {
                 'OTHER_CFLAGS': [ '-msse2', ],
               },
             }],
           ],
         },
       ],  # targets
     }],
-    ['target_arch=="arm" and arm_version>=7 or target_arch=="arm64"', {
+    ['build_with_neon==1', {
       'targets': [
         {
           'target_name': 'common_audio_neon',
           'type': 'static_library',
           'includes': ['../build/arm_neon.gypi',],
           'sources': [
             'fir_filter_neon.cc',
             'resampler/sinc_resampler_neon.cc',
             'signal_processing/cross_correlation_neon.c',
             'signal_processing/downsample_fast_neon.c',
             'signal_processing/min_max_operations_neon.c',
           ],
-          'conditions': [
-            # Disable LTO in common_audio_neon target due to compiler bug
-            ['use_lto==1', {
-              'cflags!': [
-                '-flto',
-                '-ffat-lto-objects',
-              ],
-            }],
-          ],
         },
       ],  # targets
     }],
     ['include_tests==1', {
       'targets' : [
         {
           'target_name': 'common_audio_unittests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'common_audio',
@@ skipping 67 matching lines @@
               'sources': [
                 'common_audio_unittests.isolate',
               ],
             },
           ],
         }],
       ],
     }],
   ],  # conditions
 }