Remove obsoleted target_arch==armv7 from opus.gyp.

third_party/opus/opus.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': {
     'conditions': [
-      ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', {
+      ['target_arch=="arm" or target_arch=="arm64"', {

[ajm, 2014/10/08 06:19:53]

This is broader than the corresponding BUILD.gn condition. Should we modify gn?

[kjellander_chromium, 2014/10/08 07:24:04]

Yes, please update BUILD.gn if you want (can be done in a separate CL though).
Tina made changes to opus.gyp in https://codereview.chromium.org/354903003
before I was finished with the GN work so it was never updated to reflect those
changes.

[ajm, 2014/10/08 15:55:00]

Done.

         'use_opus_fixed_point%': 1,
       }, {
         'use_opus_fixed_point%': 0,
       }],
-      ['target_arch=="arm" or target_arch=="armv7"', {
+      ['target_arch=="arm"', {
         'use_opus_arm_optimization%': 1,
       }, {
         'use_opus_arm_optimization%': 0,
       }],
-      ['target_arch=="arm"', {
+      ['target_arch=="arm" and (OS=="android" or chromeos==1)', {

[ajm, 2014/10/08 06:19:53]

This is what BUILD.gn uses, though technically it appears that we could support
Windows and desktop Linux as well. Do you think I should change both?

[kjellander_chromium, 2014/10/08 07:24:04]

GN and GYP should be the same, but I don't know enough about the desktop support
to answer that question. I'd prefer if Tina can comment on this.

[tlegrand1, 2014/10/08 09:03:27]

This change is not correct, it is the BUILD.gn that needs to be updated.

[ajm, 2014/10/08 15:55:00]

Done.

         'use_opus_rtcd%': 1,
       }, {
         'use_opus_rtcd%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'opus',
       'type': 'static_library',
@@ skipping 40 matching lines @@
           # optimizations are turned off.
           'cflags': [
             '-Wno-#pragma-messages',
           ],
           'xcode_settings': {
             'WARNING_CFLAGS': [
               '-Wno-#pragma-messages',
             ],
           },
         }],
-        ['os_posix==1 and (target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64")', {
+        ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', {
           'cflags!': ['-Os'],
           'cflags': ['-O3'],
         }],
         ['use_opus_fixed_point==0', {
           'include_dirs': [
             'src/silk/float',
           ],
           'sources': ['<@(opus_float_sources)'],
         }, {
           'defines': [
@@ skipping 57 matching lines @@
       'sources': [
         'src/src/opus_demo.c',
       ],
       'include_dirs': [
         'src/celt',
         'src/silk',
       ],
     },  # target opus_demo
   ]
 }