Re-land "Remove <(webrtc_root) from source file entries."
Changes differing from https://webrtc-codereview.appspot.com/37859004:
* I put the include_tests==1 stuff of audio_coding.gypi in its
own audio_coding_tests.gypi file, including the Android and isolate
targets which were incorrectly located in the previous CL
* I moved the bwe utilities in remote_bitrate_estimator.gypi
into include_tests==1 since they depend on test.gyp after I
cleaned up the duplicated inclusion of rtp_file_reader.cc
R=stefan@webrtc.org
TBR=tina.legrand@webrtc.org
TESTED=Passing gyp and compile using:
webrtc/build/gyp_webrtc -Dinclude_tests=1
webrtc/build/gyp_webrtc -Dinclude_tests=0
I also setup a Chromium checkout with my checkout mounted in
third_party/webrtc and ran build/gyp_chromium successfully.
BUG=4185
Review URL: https://webrtc-codereview.appspot.com/33159004
Cr-Commit-Position: refs/heads/master@{#8205}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8205 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate b/webrtc/modules/audio_coding/audio_codec_speed_tests.isolate
similarity index 100%
rename from webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.isolate
rename to webrtc/modules/audio_coding/audio_codec_speed_tests.isolate
diff --git a/webrtc/modules/audio_coding/audio_coding.gypi b/webrtc/modules/audio_coding/audio_coding.gypi
new file mode 100644
index 0000000..0a500d9
--- /dev/null
+++ b/webrtc/modules/audio_coding/audio_coding.gypi
@@ -0,0 +1,29 @@
+# Copyright (c) 2015 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': [
+ '../../build/common.gypi',
+ 'codecs/interfaces.gypi',
+ 'codecs/cng/cng.gypi',
+ 'codecs/g711/g711.gypi',
+ 'codecs/g722/g722.gypi',
+ 'codecs/ilbc/ilbc.gypi',
+ 'codecs/isac/main/source/isac.gypi',
+ 'codecs/isac/fix/source/isacfix.gypi',
+ 'codecs/pcm16b/pcm16b.gypi',
+ 'codecs/red/red.gypi',
+ 'main/acm2/audio_coding_module.gypi',
+ 'neteq/neteq.gypi',
+ ],
+ 'conditions': [
+ ['include_opus==1', {
+ 'includes': ['codecs/opus/opus.gypi',],
+ }],
+ ],
+}
diff --git a/webrtc/modules/audio_coding/audio_coding_tests.gypi b/webrtc/modules/audio_coding/audio_coding_tests.gypi
new file mode 100644
index 0000000..86a92c5
--- /dev/null
+++ b/webrtc/modules/audio_coding/audio_coding_tests.gypi
@@ -0,0 +1,72 @@
+# Copyright (c) 2015 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': [
+ '../../build/common.gypi',
+ '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',
+ ],
+ }],
+ ],
+ },
+ ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'audio_codec_speed_tests_apk_target',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):audio_codec_speed_tests_apk',
+ ],
+ },
+ ],
+ }],
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'audio_codec_speed_tests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'audio_codec_speed_tests',
+ ],
+ 'includes': [
+ '../../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'audio_codec_speed_tests.isolate',
+ ],
+ },
+ ],
+ }],
+ ],
+}
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi
deleted file mode 100644
index e296634..0000000
--- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_tests.gypi
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2014 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.
-
-{
- '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': [
- 'audio_codec_speed_test.h',
- 'audio_codec_speed_test.cc',
- '<(webrtc_root)/modules/audio_coding/codecs/opus/opus_speed_test.cc',
- '<(webrtc_root)/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'dependencies': [
- '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ],
- }],
- 'conditions': [
- ['OS=="android"', {
- 'targets': [
- {
- 'target_name': 'audio_codec_speed_tests_apk_target',
- 'type': 'none',
- 'dependencies': [
- '<(apk_tests_path):audio_codec_speed_tests_apk',
- ],
- },
- ],
- }],
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'audio_codec_speed_tests_run',
- 'type': 'none',
- 'dependencies': [
- 'audio_codec_speed_tests',
- ],
- 'includes': [
- '../../../../build/isolate.gypi',
- ],
- 'sources': [
- 'audio_codec_speed_tests.isolate',
- ],
- },
- ],
- }],
- ],
-}