From a87c398a41a4054e96cae73ba0f8596fa9189c95 Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org" <kjellander@webrtc.org>
Date: Thu, 29 Jan 2015 10:39:07 +0000
Subject: [PATCH] Move audio_codec_speed_tests into include_tests==1 condition.

I made a mistake in https://webrtc-codereview.appspot.com/37859004
and moved this target out of the include_tests==1 condition.
This moves it back in.

TBR=tina.legrand@webrtc.org
BUG=4185

Review URL: https://webrtc-codereview.appspot.com/33139004

Cr-Commit-Position: refs/heads/master@{#8198}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8198 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/modules/audio_coding/audio_coding.gypi | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/webrtc/modules/audio_coding/audio_coding.gypi b/webrtc/modules/audio_coding/audio_coding.gypi
index 613b3c2e0..d7a160ec0 100644
--- a/webrtc/modules/audio_coding/audio_coding.gypi
+++ b/webrtc/modules/audio_coding/audio_coding.gypi
@@ -21,33 +21,6 @@
     'main/acm2/audio_coding_module.gypi',
     'neteq/neteq.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'audio_codec_speed_tests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        'audio_processing',
-        'iSACFix',
-        'webrtc_opus',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
-        '<(webrtc_root)/test/test.gyp:test_support_main',
-      ],
-      'sources': [
-        'codecs/isac/fix/test/isac_speed_test.cc',
-        'codecs/opus/opus_speed_test.cc',
-        'codecs/tools/audio_codec_speed_test.h',
-        'codecs/tools/audio_codec_speed_test.cc',
-      ],
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-      ],
-    },
-  ],
   'conditions': [
     ['include_opus==1', {
       'includes': ['codecs/opus/opus.gypi',],
@@ -57,6 +30,33 @@
         'codecs/isac/isac_test.gypi',
         'codecs/isac/isacfix_test.gypi',
       ],
+      'targets': [
+        {
+          'target_name': 'audio_codec_speed_tests',
+          'type': '<(gtest_target_type)',
+          'dependencies': [
+            'audio_processing',
+            'iSACFix',
+            'webrtc_opus',
+            '<(DEPTH)/testing/gtest.gyp:gtest',
+            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+            '<(webrtc_root)/test/test.gyp:test_support_main',
+          ],
+          'sources': [
+            'codecs/isac/fix/test/isac_speed_test.cc',
+            'codecs/opus/opus_speed_test.cc',
+            'codecs/tools/audio_codec_speed_test.h',
+            'codecs/tools/audio_codec_speed_test.cc',
+          ],
+          'conditions': [
+            ['OS=="android"', {
+              'dependencies': [
+                '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+              ],
+            }],
+          ],
+        },
+      ],
     }],
     ['OS=="android"', {
       'targets': [