refactor the gyp file to gypi file.
Basically, the gypi file is a copy of gyp file, but has some difference on the
path of the dependencies.
Review URL: http://webrtc-codereview.appspot.com/137020
git-svn-id: http://webrtc.googlecode.com/svn/trunk@581 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/src/build/common.gypi b/src/build/common.gypi
index d45022e..169e295 100644
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -50,12 +50,16 @@
# Exclude internal ADM since Chromium uses its own IO handling.
'include_internal_audio_device%': 0,
+
+ 'webrtc_root%': '<(DEPTH)/third_party/webrtc',
}, {
# Settings for the standalone (not-in-Chromium) build.
'include_pulse_audio%': 1,
'include_internal_audio_device%': 1,
+ 'webrtc_root%': '<(DEPTH)/src',
+
# The Chromium common.gypi we use treats all gyp files without
# chromium_code==1 as third party code. This disables many of the
# preferred warning settings.
diff --git a/src/common_audio/common_audio.gyp b/src/common_audio/common_audio.gyp
new file mode 100644
index 0000000..9d7d0b2
--- /dev/null
+++ b/src/common_audio/common_audio.gyp
@@ -0,0 +1,16 @@
+# 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': [
+ '../common_settings.gypi', # Common settings
+ 'signal_processing_library/main/source/spl.gypi',
+ 'resampler/main/source/resampler.gypi',
+ 'vad/main/source/vad.gypi',
+ ],
+}
diff --git a/src/common_audio/resampler/main/source/resampler.gyp b/src/common_audio/resampler/main/source/resampler.gypi
similarity index 85%
rename from src/common_audio/resampler/main/source/resampler.gyp
rename to src/common_audio/resampler/main/source/resampler.gypi
index 8baf870..a8221e0 100644
--- a/src/common_audio/resampler/main/source/resampler.gyp
+++ b/src/common_audio/resampler/main/source/resampler.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'resampler',
'type': '<(library)',
'dependencies': [
- '../../../signal_processing_library/main/source/spl.gyp:spl',
+ 'spl',
],
'include_dirs': [
'../interface',
diff --git a/src/common_audio/signal_processing_library/main/source/spl.gyp b/src/common_audio/signal_processing_library/main/source/spl.gypi
similarity index 95%
rename from src/common_audio/signal_processing_library/main/source/spl.gyp
rename to src/common_audio/signal_processing_library/main/source/spl.gypi
index 70cebd1..eea6142 100644
--- a/src/common_audio/signal_processing_library/main/source/spl.gyp
+++ b/src/common_audio/signal_processing_library/main/source/spl.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'spl',
diff --git a/src/common_audio/vad/main/source/vad.gyp b/src/common_audio/vad/main/source/vad.gypi
similarity index 88%
rename from src/common_audio/vad/main/source/vad.gyp
rename to src/common_audio/vad/main/source/vad.gypi
index 754b684..7b23ae8 100644
--- a/src/common_audio/vad/main/source/vad.gyp
+++ b/src/common_audio/vad/main/source/vad.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'vad',
'type': '<(library)',
'dependencies': [
- '../../../signal_processing_library/main/source/spl.gyp:spl',
+ 'spl',
],
'include_dirs': [
'../interface',
diff --git a/src/common_video/common_video.gyp b/src/common_video/common_video.gyp
new file mode 100644
index 0000000..1f107a7
--- /dev/null
+++ b/src/common_video/common_video.gyp
@@ -0,0 +1,15 @@
+# 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': [
+ '../common_settings.gypi', # Common settings
+ 'vplib/main/source/vplib.gypi',
+ 'jpeg/main/source/jpeg.gypi',
+ ],
+}
diff --git a/src/common_video/jpeg/main/source/jpeg.gyp b/src/common_video/jpeg/main/source/jpeg.gypi
similarity index 87%
rename from src/common_video/jpeg/main/source/jpeg.gyp
rename to src/common_video/jpeg/main/source/jpeg.gypi
index cc30142..52bb889 100644
--- a/src/common_video/jpeg/main/source/jpeg.gyp
+++ b/src/common_video/jpeg/main/source/jpeg.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'variables': {
'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
},
@@ -18,7 +15,7 @@
'target_name': 'webrtc_jpeg',
'type': '<(library)',
'dependencies': [
- '../../../vplib/main/source/vplib.gyp:webrtc_vplib',
+ 'webrtc_vplib',
],
'include_dirs': [
'../../../interface',
@@ -40,11 +37,11 @@
'conditions': [
['use_libjpeg_turbo==1', {
'dependencies': [
- '../../../../../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+ '../../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
],
}, {
'dependencies': [
- '../../../../../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../../third_party/libjpeg/libjpeg.gyp:libjpeg',
],
}],
],
diff --git a/src/common_video/vplib/main/source/vplib.gyp b/src/common_video/vplib/main/source/vplib.gypi
similarity index 95%
rename from src/common_video/vplib/main/source/vplib.gyp
rename to src/common_video/vplib/main/source/vplib.gypi
index c7533c0..2bd75ed 100644
--- a/src/common_video/vplib/main/source/vplib.gyp
+++ b/src/common_video/vplib/main/source/vplib.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'webrtc_vplib',
diff --git a/src/modules/audio_coding/NetEQ/main/source/neteq.gyp b/src/modules/audio_coding/NetEQ/main/source/neteq.gypi
similarity index 81%
rename from src/modules/audio_coding/NetEQ/main/source/neteq.gyp
rename to src/modules/audio_coding/NetEQ/main/source/neteq.gypi
index eb882c9..0086f28 100644
--- a/src/modules/audio_coding/NetEQ/main/source/neteq.gyp
+++ b/src/modules/audio_coding/NetEQ/main/source/neteq.gypi
@@ -7,20 +7,17 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'NetEq',
'type': '<(library)',
'dependencies': [
- '../../../codecs/CNG/main/source/cng.gyp:CNG',
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ 'CNG',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'defines': [
- 'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which specifies a subset of codecs to support
- 'SCRATCH',
+ 'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which
+ 'SCRATCH', # specifies a subset of codecs to support.
],
'include_dirs': [
'../interface',
@@ -97,12 +94,12 @@
'dependencies': [
'NetEq', # NetEQ library defined above
'NetEqTestTools',# Test helpers
- '../../../codecs/G711/main/source/g711.gyp:G711',
- '../../../codecs/G722/main/source/g722.gyp:G722',
- '../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
- '../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
- '../../../codecs/iSAC/main/source/isac.gyp:iSAC',
- '../../../codecs/CNG/main/source/cng.gyp:CNG',
+ 'G711',
+ 'G722',
+ 'PCM16B',
+ 'iLBC',
+ 'iSAC',
+ 'CNG',
],
'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq
@@ -121,7 +118,7 @@
'CODEC_RED',
],
'include_dirs': [
- '../source',
+ './',
'../test',
],
'sources': [
@@ -133,13 +130,13 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',# Test helpers
- '../../../codecs/G711/main/source/g711.gyp:G711',
- '../../../codecs/G722/main/source/g722.gyp:G722',
- '../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
- '../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
- '../../../codecs/iSAC/main/source/isac.gyp:iSAC',
- '../../../codecs/CNG/main/source/cng.gyp:CNG',
- '../../../../../common_audio/vad/main/source/vad.gyp:vad',
+ 'G711',
+ 'G722',
+ 'PCM16B',
+ 'iLBC',
+ 'iSAC',
+ 'CNG',
+ '<(webrtc_root)/common_audio/common_audio.gyp:vad',
],
'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq
@@ -239,16 +236,16 @@
# Collection of useful functions used in other tests
'type': '<(library)',
'dependencies': [
- '../../../codecs/G711/main/source/g711.gyp:G711',
- '../../../codecs/G722/main/source/g722.gyp:G722',
- '../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
- '../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
- '../../../codecs/iSAC/main/source/isac.gyp:iSAC',
- '../../../codecs/CNG/main/source/cng.gyp:CNG',
+ 'G711',
+ 'G722',
+ 'PCM16B',
+ 'iLBC',
+ 'iSAC',
+ 'CNG',
],
'direct_dependent_settings': {
'include_dirs': [
- '../test',
+ '../test',
'../interface',
],
},
@@ -269,7 +266,7 @@
'CODEC_RED',
],
'include_dirs': [
- '../source',
+ './',
'../interface',
'../test',
],
diff --git a/src/modules/audio_coding/codecs/CNG/main/source/cng.gyp b/src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
similarity index 83%
rename from src/modules/audio_coding/codecs/CNG/main/source/cng.gyp
rename to src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
index 6d5ecaf..6c1851e 100644
--- a/src/modules/audio_coding/codecs/CNG/main/source/cng.gyp
+++ b/src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'CNG',
'type': '<(library)',
'dependencies': [
- '../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_coding/codecs/G711/main/source/g711.gyp b/src/modules/audio_coding/codecs/G711/main/source/g711.gypi
similarity index 94%
rename from src/modules/audio_coding/codecs/G711/main/source/g711.gyp
rename to src/modules/audio_coding/codecs/G711/main/source/g711.gypi
index 008bd92..19e8a43 100644
--- a/src/modules/audio_coding/codecs/G711/main/source/g711.gyp
+++ b/src/modules/audio_coding/codecs/G711/main/source/g711.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'G711',
diff --git a/src/modules/audio_coding/codecs/G722/main/source/g722.gyp b/src/modules/audio_coding/codecs/G722/main/source/g722.gypi
similarity index 94%
rename from src/modules/audio_coding/codecs/G722/main/source/g722.gyp
rename to src/modules/audio_coding/codecs/G722/main/source/g722.gypi
index 1bafee2..4ac9ed9 100644
--- a/src/modules/audio_coding/codecs/G722/main/source/g722.gyp
+++ b/src/modules/audio_coding/codecs/G722/main/source/g722.gypi
@@ -6,9 +6,6 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'G722',
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gyp b/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
similarity index 90%
rename from src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gyp
rename to src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
index fd6ed80..07152a7 100644
--- a/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gyp
+++ b/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'PCM16B',
diff --git a/src/modules/audio_coding/codecs/iLBC/ilbc_test.gyp b/src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi
similarity index 86%
rename from src/modules/audio_coding/codecs/iLBC/ilbc_test.gyp
rename to src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi
index 6f6ca9a..806d1f7 100644
--- a/src/modules/audio_coding/codecs/iLBC/ilbc_test.gyp
+++ b/src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
# ilbc_test
{
'target_name': 'iLBCtest',
'type': 'executable',
'dependencies': [
- './main/source/ilbc.gyp:iLBC',
+ 'iLBC',
],
'include_dirs': [
'./main/interface',
diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gyp b/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi
similarity index 95%
rename from src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gyp
rename to src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi
index bcd5f81..d568750 100644
--- a/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gyp
+++ b/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'iLBC',
'type': '<(library)',
'dependencies': [
- '../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gyp b/src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
similarity index 91%
rename from src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gyp
rename to src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
index d9651fa..b3c7340 100644
--- a/src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gyp
+++ b/src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'iSACFix',
'type': '<(library)',
'dependencies': [
- '../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_coding/codecs/iSAC/isac_test.gyp b/src/modules/audio_coding/codecs/iSAC/isac_test.gypi
similarity index 89%
rename from src/modules/audio_coding/codecs/iSAC/isac_test.gyp
rename to src/modules/audio_coding/codecs/iSAC/isac_test.gypi
index 726238c..f04c771 100644
--- a/src/modules/audio_coding/codecs/iSAC/isac_test.gyp
+++ b/src/modules/audio_coding/codecs/iSAC/isac_test.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
# simple kenny
{
'target_name': 'iSACtest',
'type': 'executable',
'dependencies': [
- './main/source/isac.gyp:iSAC',
+ 'iSAC',
],
'include_dirs': [
'./main/test',
@@ -33,7 +30,7 @@
'target_name': 'iSACAPITest',
'type': 'executable',
'dependencies': [
- './main/source/isac.gyp:iSAC',
+ 'iSAC',
],
'include_dirs': [
'./main/test',
@@ -50,7 +47,7 @@
'target_name': 'iSACSwitchSampRateTest',
'type': 'executable',
'dependencies': [
- './main/source/isac.gyp:iSAC',
+ 'iSAC',
],
'include_dirs': [
'./main/test',
diff --git a/src/modules/audio_coding/codecs/iSAC/isacfix_test.gyp b/src/modules/audio_coding/codecs/iSAC/isacfix_test.gypi
similarity index 86%
rename from src/modules/audio_coding/codecs/iSAC/isacfix_test.gyp
rename to src/modules/audio_coding/codecs/iSAC/isacfix_test.gypi
index dd9ccd9..627342f 100644
--- a/src/modules/audio_coding/codecs/iSAC/isacfix_test.gyp
+++ b/src/modules/audio_coding/codecs/iSAC/isacfix_test.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
# kenny
{
'target_name': 'iSACFixtest',
'type': 'executable',
'dependencies': [
- './fix/source/isacfix.gyp:iSACFix',
+ 'iSACFix',
],
'include_dirs': [
'./fix/test',
diff --git a/src/modules/audio_coding/codecs/iSAC/main/source/isac.gyp b/src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi
similarity index 92%
rename from src/modules/audio_coding/codecs/iSAC/main/source/isac.gyp
rename to src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi
index cdfbe27..94529f1 100644
--- a/src/modules/audio_coding/codecs/iSAC/main/source/isac.gyp
+++ b/src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'iSAC',
'type': '<(library)',
'dependencies': [
- '../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_coding/main/source/audio_coding_module.gyp b/src/modules/audio_coding/main/source/audio_coding_module.gypi
similarity index 76%
rename from src/modules/audio_coding/main/source/audio_coding_module.gyp
rename to src/modules/audio_coding/main/source/audio_coding_module.gypi
index 79f8d1c..42d26f1 100644
--- a/src/modules/audio_coding/main/source/audio_coding_module.gyp
+++ b/src/modules/audio_coding/main/source/audio_coding_module.gypi
@@ -7,26 +7,23 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'audio_coding_module',
'type': '<(library)',
'dependencies': [
- '../../codecs/CNG/main/source/cng.gyp:CNG',
- '../../codecs/G711/main/source/g711.gyp:G711',
- '../../codecs/G722/main/source/g722.gyp:G722',
- '../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
- '../../codecs/iSAC/main/source/isac.gyp:iSAC',
- '../../codecs/iSAC/fix/source/isacfix.gyp:iSACFix',
- '../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
- '../../NetEQ/main/source/neteq.gyp:NetEq',
- '../../../../common_audio/resampler/main/source/resampler.gyp:resampler',
- '../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../../common_audio/vad/main/source/vad.gyp:vad',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'CNG',
+ 'G711',
+ 'G722',
+ 'iLBC',
+ 'iSAC',
+ 'iSACFix',
+ 'PCM16B',
+ 'NetEq',
+ '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:vad',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -34,12 +31,11 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '../interface',
- '../../../interface',
+ '../interface',
+ '../../../interface',
],
},
'sources': [
- # TODO: Remove files from here and P4 when ACM is slimmed down.
'../interface/audio_coding_module.h',
'../interface/audio_coding_module_typedefs.h',
'acm_amr.cc',
@@ -104,7 +100,7 @@
'type': 'executable',
'dependencies': [
'audio_coding_module',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'../test/ACMTest.cpp',
diff --git a/src/modules/audio_conference_mixer/source/audio_conference_mixer.gyp b/src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
similarity index 71%
rename from src/modules/audio_conference_mixer/source/audio_conference_mixer.gyp
rename to src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
index 8b06908..9037d34 100644
--- a/src/modules/audio_conference_mixer/source/audio_conference_mixer.gyp
+++ b/src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
@@ -1,17 +1,18 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'audio_conference_mixer',
'type': '<(library)',
'dependencies': [
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_device/main/source/audio_device.gyp b/src/modules/audio_device/main/source/audio_device.gypi
similarity index 88%
rename from src/modules/audio_device/main/source/audio_device.gyp
rename to src/modules/audio_device/main/source/audio_device.gypi
index a80f151..fbae67b 100644
--- a/src/modules/audio_device/main/source/audio_device.gyp
+++ b/src/modules/audio_device/main/source/audio_device.gypi
@@ -7,17 +7,14 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'audio_device',
'type': '<(library)',
'dependencies': [
- '../../../../common_audio/resampler/main/source/resampler.gyp:resampler',
- '../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'.',
@@ -156,8 +153,8 @@
'type': 'executable',
'dependencies': [
'audio_device',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'webrtc_utility',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'../test/audio_device_test_api.cc',
@@ -169,9 +166,9 @@
'type': 'executable',
'dependencies': [
'audio_device',
- '../../../../common_audio/resampler/main/source/resampler.gyp:resampler',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'webrtc_utility',
+ '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'../test/audio_device_test_func.cc',
diff --git a/src/modules/audio_processing/aec/main/source/aec.gyp b/src/modules/audio_processing/aec/main/source/aec.gypi
similarity index 84%
rename from src/modules/audio_processing/aec/main/source/aec.gyp
rename to src/modules/audio_processing/aec/main/source/aec.gypi
index 3d094f2..e28104f 100644
--- a/src/modules/audio_processing/aec/main/source/aec.gyp
+++ b/src/modules/audio_processing/aec/main/source/aec.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'aec',
'type': '<(library)',
'dependencies': [
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../utility/util.gyp:apm_util'
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ 'apm_util'
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_processing/aecm/main/source/aecm.gyp b/src/modules/audio_processing/aecm/main/source/aecm.gypi
similarity index 83%
rename from src/modules/audio_processing/aecm/main/source/aecm.gyp
rename to src/modules/audio_processing/aecm/main/source/aecm.gypi
index 6543599..3c63c52 100644
--- a/src/modules/audio_processing/aecm/main/source/aecm.gyp
+++ b/src/modules/audio_processing/aecm/main/source/aecm.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'aecm',
'type': '<(library)',
'dependencies': [
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../utility/util.gyp:apm_util'
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ 'apm_util'
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_processing/agc/main/source/agc.gyp b/src/modules/audio_processing/agc/main/source/agc.gypi
similarity index 84%
rename from src/modules/audio_processing/agc/main/source/agc.gyp
rename to src/modules/audio_processing/agc/main/source/agc.gypi
index e28a4c8..f0642e7 100644
--- a/src/modules/audio_processing/agc/main/source/agc.gyp
+++ b/src/modules/audio_processing/agc/main/source/agc.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'agc',
'type': '<(library)',
'dependencies': [
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_processing/main/apm_tests.gyp b/src/modules/audio_processing/main/apm_tests.gypi
similarity index 77%
rename from src/modules/audio_processing/main/apm_tests.gyp
rename to src/modules/audio_processing/main/apm_tests.gypi
index 73ed54f..f40cbb4 100644
--- a/src/modules/audio_processing/main/apm_tests.gyp
+++ b/src/modules/audio_processing/main/apm_tests.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../common_settings.gypi',
- ],
'variables': {
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'protoc_out_relpath': 'webrtc/audio_processing',
@@ -27,12 +24,12 @@
],
'dependencies': [
'unittest_proto',
- 'source/apm.gyp:audio_processing',
- '../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../testing/gtest.gyp:gtest',
- '../../../../testing/gtest.gyp:gtest_main',
- '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ 'audio_processing',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
+ '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
],
'include_dirs': [
'../../../../testing/gtest/include',
@@ -75,7 +72,7 @@
},
],
'dependencies': [
- '../../../../third_party/protobuf/protobuf.gyp:protoc#host',
+ '../../third_party/protobuf/protobuf.gyp:protoc#host',
],
# This target exports a hard dependency because it generates header
# files.
@@ -85,11 +82,11 @@
'target_name': 'process_test',
'type': 'executable',
'dependencies': [
- 'source/apm.gyp:audio_processing',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../testing/gtest.gyp:gtest',
- '../../../../testing/gtest.gyp:gtest_main',
- '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ 'audio_processing',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
+ '<(webrtc_root)/../third_party/protobuf/protobuf.gyp:protobuf_lite',
],
'include_dirs': [
'../../../../testing/gtest/include',
diff --git a/src/modules/audio_processing/main/source/apm.gyp b/src/modules/audio_processing/main/source/apm.gypi
similarity index 80%
rename from src/modules/audio_processing/main/source/apm.gyp
rename to src/modules/audio_processing/main/source/apm.gypi
index 0bb7fa6..5cac671 100644
--- a/src/modules/audio_processing/main/source/apm.gyp
+++ b/src/modules/audio_processing/main/source/apm.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi',
- ],
'variables': {
'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'protoc_out_relpath': 'webrtc/audio_processing',
@@ -20,30 +17,30 @@
'type': '<(library)',
'conditions': [
['prefer_fixed_point==1', {
- 'dependencies': ['../../ns/main/source/ns.gyp:ns_fix'],
+ 'dependencies': ['ns_fix'],
'defines': ['WEBRTC_NS_FIXED'],
}, {
- 'dependencies': ['../../ns/main/source/ns.gyp:ns'],
+ 'dependencies': ['ns'],
'defines': ['WEBRTC_NS_FLOAT'],
}],
['build_with_chromium==1', {
'dependencies': [
- '../../../../../protobuf/protobuf.gyp:protobuf_lite',
+ '../../protobuf/protobuf.gyp:protobuf_lite',
],
}, {
'dependencies': [
- '../../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../../third_party/protobuf/protobuf.gyp:protobuf_lite',
],
}],
],
'dependencies': [
'debug_proto',
- '../../aec/main/source/aec.gyp:aec',
- '../../aecm/main/source/aecm.gyp:aecm',
- '../../agc/main/source/agc.gyp:agc',
- '../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../../common_audio/vad/main/source/vad.gyp:vad',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'aec',
+ 'aecm',
+ 'agc',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:vad',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -89,7 +86,7 @@
'target_name': 'debug_proto',
'type': 'none',
'variables': {
- 'proto_relpath': '.',
+ 'proto_relpath': 'audio_processing/main/source/',
},
'sources': [
'<(proto_relpath)/debug.proto',
@@ -117,11 +114,11 @@
'conditions': [
['build_with_chromium==1', {
'dependencies': [
- '../../../../../protobuf/protobuf.gyp:protoc#host',
+ '../../protobuf/protobuf.gyp:protoc#host',
],
}, {
'dependencies': [
- '../../../../../third_party/protobuf/protobuf.gyp:protoc#host',
+ '../../third_party/protobuf/protobuf.gyp:protoc#host',
],
}],
],
diff --git a/src/modules/audio_processing/ns/main/source/ns.gyp b/src/modules/audio_processing/ns/main/source/ns.gypi
similarity index 83%
rename from src/modules/audio_processing/ns/main/source/ns.gyp
rename to src/modules/audio_processing/ns/main/source/ns.gypi
index c8488b2..9bdbcb9 100644
--- a/src/modules/audio_processing/ns/main/source/ns.gyp
+++ b/src/modules/audio_processing/ns/main/source/ns.gypi
@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'ns',
'type': '<(library)',
'dependencies': [
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../utility/util.gyp:apm_util'
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ 'apm_util'
],
'include_dirs': [
'../interface',
@@ -39,7 +36,7 @@
'target_name': 'ns_fix',
'type': '<(library)',
'dependencies': [
- '../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/audio_processing/utility/util.gyp b/src/modules/audio_processing/utility/util.gypi
similarity index 92%
rename from src/modules/audio_processing/utility/util.gyp
rename to src/modules/audio_processing/utility/util.gypi
index 3348da8..331de4b 100644
--- a/src/modules/audio_processing/utility/util.gyp
+++ b/src/modules/audio_processing/utility/util.gypi
@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'apm_util',
diff --git a/src/modules/media_file/source/media_file.gyp b/src/modules/media_file/source/media_file.gyp
deleted file mode 100644
index 0aff195..0000000
--- a/src/modules/media_file/source/media_file.gyp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
- 'includes': [
- '../../../common_settings.gypi', # Common settings
- ],
- 'targets': [
- {
- 'target_name': 'media_file',
- 'type': '<(library)',
- 'dependencies': [
- '../../utility/source/utility.gyp:webrtc_utility',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
- 'defines': [
- 'WEBRTC_MODULE_UTILITY_VIDEO', # for compiling support for video recording
- ],
- 'include_dirs': [
- '../interface',
- '../../interface',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../interface',
- '../../interface',
- ],
- },
- 'sources': [
- '../interface/media_file.h',
- '../interface/media_file_defines.h',
- 'avi_file.cc',
- 'avi_file.h',
- 'media_file_impl.cc',
- 'media_file_impl.h',
- 'media_file_utility.cc',
- 'media_file_utility.h',
- ], # source
- },
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/media_file/source/media_file.gypi b/src/modules/media_file/source/media_file.gypi
new file mode 100644
index 0000000..c94679f
--- /dev/null
+++ b/src/modules/media_file/source/media_file.gypi
@@ -0,0 +1,49 @@
+# 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.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'media_file',
+ 'type': '<(library)',
+ 'dependencies': [
+ 'webrtc_utility',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ ],
+ 'defines': [
+ 'WEBRTC_MODULE_UTILITY_VIDEO', # for compiling support for video recording
+ ],
+ 'include_dirs': [
+ '../interface',
+ '../../interface',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../interface',
+ '../../interface',
+ ],
+ },
+ 'sources': [
+ '../interface/media_file.h',
+ '../interface/media_file_defines.h',
+ 'avi_file.cc',
+ 'avi_file.h',
+ 'media_file_impl.cc',
+ 'media_file_impl.h',
+ 'media_file_utility.cc',
+ 'media_file_utility.h',
+ ], # source
+ },
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
new file mode 100644
index 0000000..d4e44c1
--- /dev/null
+++ b/src/modules/modules.gyp
@@ -0,0 +1,59 @@
+# 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': [
+ '../common_settings.gypi',
+ 'audio_coding/codecs/CNG/main/source/cng.gypi',
+ 'audio_coding/codecs/G711/main/source/g711.gypi',
+ 'audio_coding/codecs/G722/main/source/g722.gypi',
+ 'audio_coding/codecs/iLBC/main/source/ilbc.gypi',
+ 'audio_coding/codecs/iSAC/main/source/isac.gypi',
+ 'audio_coding/codecs/iSAC/fix/source/isacfix.gypi',
+ 'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi',
+ 'audio_coding/main/source/audio_coding_module.gypi',
+ 'audio_coding/NetEQ/main/source/neteq.gypi',
+ 'audio_conference_mixer/source/audio_conference_mixer.gypi',
+ 'audio_device/main/source/audio_device.gypi',
+ 'audio_processing/utility/util.gypi',
+ 'audio_processing/ns/main/source/ns.gypi',
+ 'audio_processing/agc/main/source/agc.gypi',
+ 'audio_processing/main/source/apm.gypi',
+ 'audio_processing/aec/main/source/aec.gypi',
+ 'audio_processing/aecm/main/source/aecm.gypi',
+ 'media_file/source/media_file.gypi',
+ 'udp_transport/source/udp_transport.gypi',
+ 'utility/source/utility.gypi',
+ 'video_coding/codecs/i420/main/source/i420.gypi',
+ 'video_coding/codecs/test_framework/test_framework.gypi',
+ 'video_coding/codecs/vp8/main/source/vp8.gypi',
+ 'video_coding/main/source/video_coding.gypi',
+ 'video_capture/main/source/video_capture.gypi',
+ 'video_processing/main/source/video_processing.gypi',
+ 'video_render/main/source/video_render.gypi',
+ 'rtp_rtcp/source/rtp_rtcp.gypi',
+ 'rtp_rtcp/test/bwe_standalone.gypi',
+ ],
+
+ # Test targets, excluded when building with Chromium.
+ 'conditions': [
+ ['build_with_chromium==0', {
+ 'includes': [
+ 'audio_coding/codecs/iLBC/ilbc_test.gypi',
+ 'audio_coding/codecs/iSAC/isac_test.gypi',
+ 'audio_coding/codecs/iSAC/isacfix_test.gypi',
+ 'audio_processing/main/apm_tests.gypi',
+ 'rtp_rtcp/source/rtp_rtcp_tests.gypi',
+ 'rtp_rtcp/test/test_bwe/test_bwe.gypi',
+ 'rtp_rtcp/test/testFec/test_fec.gypi',
+ 'video_coding/main/source/video_coding_test.gypi',
+ 'video_processing/main/test/vpm_tests.gypi',
+ ], # includes
+ }], # build_with_chromium
+ ], # conditions
+}
diff --git a/src/modules/rtp_rtcp/source/rtp_rtcp.gyp b/src/modules/rtp_rtcp/source/rtp_rtcp.gypi
similarity index 81%
rename from src/modules/rtp_rtcp/source/rtp_rtcp.gyp
rename to src/modules/rtp_rtcp/source/rtp_rtcp.gypi
index fdd8ee8..1a235cd 100644
--- a/src/modules/rtp_rtcp/source/rtp_rtcp.gyp
+++ b/src/modules/rtp_rtcp/source/rtp_rtcp.gypi
@@ -1,17 +1,18 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'rtp_rtcp',
'type': '<(library)',
'dependencies': [
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gyp b/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
similarity index 73%
rename from src/modules/rtp_rtcp/source/rtp_rtcp_tests.gyp
rename to src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
index 63245c1..6eed8d0 100644
--- a/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gyp
+++ b/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
@@ -7,17 +7,14 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'rtp_format_vp8_unittest',
'type': 'executable',
'dependencies': [
- 'rtp_rtcp.gyp:rtp_rtcp',
- '../../../../testing/gtest.gyp:gtest',
- '../../../../testing/gtest.gyp:gtest_main',
+ 'rtp_rtcp',
+ '../../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest_main',
],
'include_dirs': [
'.',
@@ -26,14 +23,13 @@
'rtp_format_vp8_unittest.cc',
],
},
-
{
'target_name': 'rtp_utility_test',
'type': 'executable',
'dependencies': [
- 'rtp_rtcp.gyp:rtp_rtcp',
- '../../../../testing/gtest.gyp:gtest',
- '../../../../testing/gtest.gyp:gtest_main',
+ 'rtp_rtcp',
+ '../../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest_main',
],
'include_dirs': [
'.',
diff --git a/src/modules/rtp_rtcp/test/bwe_standalone.gyp b/src/modules/rtp_rtcp/test/bwe_standalone.gypi
similarity index 79%
rename from src/modules/rtp_rtcp/test/bwe_standalone.gyp
rename to src/modules/rtp_rtcp/test/bwe_standalone.gypi
index dc4d741..65f1300 100644
--- a/src/modules/rtp_rtcp/test/bwe_standalone.gyp
+++ b/src/modules/rtp_rtcp/test/bwe_standalone.gypi
@@ -1,20 +1,21 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'bwe_standalone',
'type': 'executable',
'dependencies': [
'matlab_plotting',
- '../source/rtp_rtcp.gyp:rtp_rtcp',
- '../../udp_transport/source/udp_transport.gyp:udp_transport',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'rtp_rtcp',
+ 'udp_transport',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -47,7 +48,7 @@
'type': '<(library)',
'dependencies': [
'matlab_plotting_include',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'/opt/matlab2010a/extern/include',
@@ -106,7 +107,7 @@
'type': 'executable',
'dependencies': [
'matlab_plotting',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
],
diff --git a/src/modules/rtp_rtcp/test/testFec/test_fec.gyp b/src/modules/rtp_rtcp/test/testFec/test_fec.gypi
similarity index 86%
rename from src/modules/rtp_rtcp/test/testFec/test_fec.gyp
rename to src/modules/rtp_rtcp/test/testFec/test_fec.gypi
index c5830a8..b0b042b 100644
--- a/src/modules/rtp_rtcp/test/testFec/test_fec.gyp
+++ b/src/modules/rtp_rtcp/test/testFec/test_fec.gypi
@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'test_fec',
'type': 'executable',
'dependencies': [
- '../../source/rtp_rtcp.gyp:rtp_rtcp',
+ 'rtp_rtcp',
],
'include_dirs': [
@@ -35,4 +32,4 @@
# tab-width:2
# indent-tabs-mode:nil
# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
\ No newline at end of file
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/modules/rtp_rtcp/test/test_bwe/test_bwe.gyp b/src/modules/rtp_rtcp/test/test_bwe/test_bwe.gypi
similarity index 71%
rename from src/modules/rtp_rtcp/test/test_bwe/test_bwe.gyp
rename to src/modules/rtp_rtcp/test/test_bwe/test_bwe.gypi
index cce7f42..1165b7d 100644
--- a/src/modules/rtp_rtcp/test/test_bwe/test_bwe.gyp
+++ b/src/modules/rtp_rtcp/test/test_bwe/test_bwe.gypi
@@ -7,18 +7,15 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'test_bwe',
'type': 'executable',
'dependencies': [
- '../../source/rtp_rtcp.gyp:rtp_rtcp',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../../testing/gtest.gyp:gtest',
- '../../../../../testing/gtest.gyp:gtest_main',
+ 'rtp_rtcp',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
],
'include_dirs': [
'../../source',
diff --git a/src/modules/udp_transport/source/udp_transport.gyp b/src/modules/udp_transport/source/udp_transport.gypi
similarity index 84%
rename from src/modules/udp_transport/source/udp_transport.gyp
rename to src/modules/udp_transport/source/udp_transport.gypi
index 561f7a1..54a19d3 100644
--- a/src/modules/udp_transport/source/udp_transport.gyp
+++ b/src/modules/udp_transport/source/udp_transport.gypi
@@ -1,17 +1,18 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'udp_transport',
'type': '<(library)',
'dependencies': [
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/utility/source/utility.gyp b/src/modules/utility/source/utility.gypi
similarity index 71%
rename from src/modules/utility/source/utility.gyp
rename to src/modules/utility/source/utility.gypi
index 1150cf4..8230d7e 100644
--- a/src/modules/utility/source/utility.gyp
+++ b/src/modules/utility/source/utility.gypi
@@ -1,19 +1,20 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'webrtc_utility',
'type': '<(library)',
'dependencies': [
- '../../audio_coding/main/source/audio_coding_module.gyp:audio_coding_module',
- '../../../common_audio/resampler/main/source/resampler.gyp:resampler',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'audio_coding_module',
+ '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -50,7 +51,7 @@
'WEBRTC_MODULE_UTILITY_VIDEO',
],
'dependencies': [
- '../../video_coding/main/source/video_coding.gyp:webrtc_video_coding',
+ 'webrtc_video_coding',
],
'include_dirs': [
'../../video_coding/main/interface',
diff --git a/src/modules/video_capture/main/source/video_capture.gyp b/src/modules/video_capture/main/source/video_capture.gypi
similarity index 91%
rename from src/modules/video_capture/main/source/video_capture.gyp
rename to src/modules/video_capture/main/source/video_capture.gypi
index 1c8ff85..db7d8dc 100644
--- a/src/modules/video_capture/main/source/video_capture.gyp
+++ b/src/modules/video_capture/main/source/video_capture.gypi
@@ -1,19 +1,20 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'video_capture_module',
'type': '<(library)',
'dependencies': [
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'webrtc_utility',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -57,7 +58,7 @@
],
}],
['OS=="mac" and build_with_chromium==0', {
- 'sources': [
+ 'sources': [
'Mac/QTKit/video_capture_recursive_lock.h',
'Mac/QTKit/video_capture_qtkit.h',
'Mac/QTKit/video_capture_qtkit_info.h',
@@ -192,10 +193,10 @@
'type': 'executable',
'dependencies': [
'video_capture_module',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
- '../../../video_render/main/source/video_render.gyp:video_render_module',
- '../../../video_coding/main/source/video_coding.gyp:webrtc_video_coding',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'webrtc_utility',
+ 'video_render_module',
+ 'webrtc_video_coding',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/video_coding/codecs/i420/main/source/i420.gyp b/src/modules/video_coding/codecs/i420/main/source/i420.gyp
deleted file mode 100644
index f3afcb6..0000000
--- a/src/modules/video_coding/codecs/i420/main/source/i420.gyp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
- 'includes': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
- 'targets': [
- {
- 'target_name': 'webrtc_i420',
- 'type': '<(library)',
- 'dependencies': [
- '../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
- 'include_dirs': [
- '../interface',
- '../../../interface',
- '../../../../../../common_video/interface',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../interface',
- '../../../../../../common_video/interface',
- ],
- },
- 'sources': [
- '../interface/i420.h',
- 'i420.cc',
- ],
- },
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/common_audio/resampler/main/source/resampler.gyp b/src/modules/video_coding/codecs/i420/main/source/i420.gypi
similarity index 71%
copy from src/common_audio/resampler/main/source/resampler.gyp
copy to src/modules/video_coding/codecs/i420/main/source/i420.gypi
index 8baf870..af13f8d 100644
--- a/src/common_audio/resampler/main/source/resampler.gyp
+++ b/src/modules/video_coding/codecs/i420/main/source/i420.gypi
@@ -7,27 +7,27 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
- 'target_name': 'resampler',
+ 'target_name': 'webrtc_i420',
'type': '<(library)',
'dependencies': [
- '../../../signal_processing_library/main/source/spl.gyp:spl',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
+ '../../../interface',
+ '../../../../../../common_video/interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
+ '../../../../../../common_video/interface',
],
},
'sources': [
- '../interface/resampler.h',
- 'resampler.cc',
+ '../interface/i420.h',
+ 'i420.cc',
],
},
],
diff --git a/src/modules/video_coding/codecs/test_framework/test_framework.gyp b/src/modules/video_coding/codecs/test_framework/test_framework.gypi
similarity index 70%
rename from src/modules/video_coding/codecs/test_framework/test_framework.gyp
rename to src/modules/video_coding/codecs/test_framework/test_framework.gypi
index 22f2ccb..9194f9e 100644
--- a/src/modules/video_coding/codecs/test_framework/test_framework.gyp
+++ b/src/modules/video_coding/codecs/test_framework/test_framework.gypi
@@ -1,11 +1,12 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
# Exclude the test target when building with chromium.
'conditions': [
['build_with_chromium==0', {
@@ -15,8 +16,8 @@
'type': '<(library)',
'dependencies': [
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
],
'include_dirs': [
diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp b/src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
similarity index 69%
rename from src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
rename to src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
index fa6adb0..0cc2b74 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
+++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
@@ -1,17 +1,18 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'webrtc_vp8',
'type': '<(library)',
'dependencies': [
- '../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -24,8 +25,8 @@
'conditions': [
['target_arch=="arm"', {
'dependencies': [
- '../../../../../../../libvpx/libvpx.gyp:libvpx_lib',
- '../../../../../../../libvpx/libvpx.gyp:libvpx_include',
+ '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_lib',
+ '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include',
],
}, { # arm
'conditions': [
@@ -34,11 +35,11 @@
# We don't want to link with the static library inside Chromium
# on Windows. Chromium uses the ffmpeg DLL and exports the
# necessary libvpx symbols for us.
- '../../../../../../../libvpx/libvpx.gyp:libvpx_include',
+ '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx_include',
],
},{ # non-arm, win
'dependencies': [
- '../../../../../../../libvpx/libvpx.gyp:libvpx',
+ '<(webrtc_root)/../libvpx/libvpx.gyp:libvpx',
],
'include_dirs': [
'../../../../../../../libvpx/source/libvpx',
@@ -52,20 +53,14 @@
],
},{
'dependencies': [
- '../../../../../../../third_party/libvpx/libvpx.gyp:libvpx',
+ '<(webrtc_root)/../third_party/libvpx/libvpx.gyp:libvpx',
],
'include_dirs': [
'../../../../../../../third_party/libvpx/source/libvpx',
],
'defines': [
- 'WEBRTC_LIBVPX_VERSION=971', # Cayuga
- #'INDEPENDENT_PARTITIONS',
+ 'WEBRTC_LIBVPX_VERSION=971' # Cayuga
],
- 'direct_dependent_settings': {
- 'defines': [
- #'INDEPENDENT_PARTITIONS',
- ],
- },
}],
],
'direct_dependent_settings': {
@@ -82,17 +77,17 @@
},
], # targets
# Exclude the test target when building with chromium.
- 'conditions': [
+ 'conditions': [
['build_with_chromium==0', {
'targets': [
{
'target_name': 'vp8_test',
'type': 'executable',
'dependencies': [
+ 'test_framework',
'webrtc_vp8',
- '../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../test_framework/test_framework.gyp:test_framework',
- '../../../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib'
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
# header files
diff --git a/src/modules/video_coding/main/source/video_coding.gyp b/src/modules/video_coding/main/source/video_coding.gypi
similarity index 79%
rename from src/modules/video_coding/main/source/video_coding.gyp
rename to src/modules/video_coding/main/source/video_coding.gypi
index f2431f4..49add57 100644
--- a/src/modules/video_coding/main/source/video_coding.gyp
+++ b/src/modules/video_coding/main/source/video_coding.gypi
@@ -1,20 +1,21 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'webrtc_video_coding',
'type': '<(library)',
'dependencies': [
- '../../codecs/i420/main/source/i420.gyp:webrtc_i420',
- '../../codecs/vp8/main/source/vp8.gyp:webrtc_vp8',
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'webrtc_i420',
+ 'webrtc_vp8',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/video_coding/main/source/video_coding_test.gyp b/src/modules/video_coding/main/source/video_coding_test.gypi
similarity index 71%
rename from src/modules/video_coding/main/source/video_coding_test.gyp
rename to src/modules/video_coding/main/source/video_coding_test.gypi
index 84e380c..7f47cf7 100644
--- a/src/modules/video_coding/main/source/video_coding_test.gyp
+++ b/src/modules/video_coding/main/source/video_coding_test.gypi
@@ -1,21 +1,22 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'video_coding_test',
'type': 'executable',
'dependencies': [
- 'video_coding.gyp:webrtc_video_coding',
- '../../../rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp',
- '../../../utility/source/utility.gyp:webrtc_utility',
- '../../../video_processing/main/source/video_processing.gyp:video_processing',
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
+ 'webrtc_video_coding',
+ 'rtp_rtcp',
+ 'webrtc_utility',
+ 'video_processing',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
],
'include_dirs': [
'../../../interface',
@@ -76,10 +77,10 @@
'target_name': 'video_coding_unit_test',
'type': 'executable',
'dependencies': [
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../../testing/gtest.gyp:gtest',
- '../../../../../testing/gtest.gyp:gtest_main',
- 'video_coding.gyp:webrtc_video_coding',
+ 'webrtc_video_coding',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest',
+ '<(webrtc_root)/../testing/gtest.gyp:gtest_main',
],
'include_dirs': [
'../../../interface',
diff --git a/src/modules/video_processing/main/source/video_processing.gyp b/src/modules/video_processing/main/source/video_processing.gypi
similarity index 65%
rename from src/modules/video_processing/main/source/video_processing.gyp
rename to src/modules/video_processing/main/source/video_processing.gypi
index bdda16b..a6ada81 100644
--- a/src/modules/video_processing/main/source/video_processing.gyp
+++ b/src/modules/video_processing/main/source/video_processing.gypi
@@ -1,20 +1,21 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'video_processing',
'type': '<(library)',
'dependencies': [
- '../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'webrtc_utility',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
diff --git a/src/modules/video_processing/main/test/vpm_tests.gyp b/src/modules/video_processing/main/test/vpm_tests.gypi
similarity index 64%
rename from src/modules/video_processing/main/test/vpm_tests.gyp
rename to src/modules/video_processing/main/test/vpm_tests.gypi
index dd764d5..92b47ae 100644
--- a/src/modules/video_processing/main/test/vpm_tests.gyp
+++ b/src/modules/video_processing/main/test/vpm_tests.gypi
@@ -1,21 +1,22 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'VPMUnitTest',
'type': 'executable',
'dependencies': [
- '../source/video_processing.gyp:video_processing',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'video_processing',
+ 'webrtc_utility',
# The tests are based on gtest
- '../../../../../testing/gtest.gyp:gtest',
- '../../../../../testing/gtest.gyp:gtest_main',
+ '../../testing/gtest.gyp:gtest',
+ '../../testing/gtest.gyp:gtest_main',
],
'include_dirs': [
'../../../../system_wrappers/interface',
diff --git a/src/modules/video_render/main/source/video_render.gyp b/src/modules/video_render/main/source/video_render.gypi
similarity index 87%
rename from src/modules/video_render/main/source/video_render.gyp
rename to src/modules/video_render/main/source/video_render.gypi
index c8ad918..1591524 100644
--- a/src/modules/video_render/main/source/video_render.gyp
+++ b/src/modules/video_render/main/source/video_render.gypi
@@ -1,19 +1,20 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'video_render_module',
'type': '<(library)',
'dependencies': [
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../utility/source/utility.gyp:webrtc_utility',
+ 'webrtc_utility',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'.',
@@ -135,9 +136,9 @@
'type': 'executable',
'dependencies': [
'video_render_module',
- '../../../utility/source/utility.gyp:webrtc_utility',
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
+ 'webrtc_utility',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
],
'include_dirs': [
],
diff --git a/src/video_engine.gyp b/src/video_engine.gyp
deleted file mode 100644
index c7343c7..0000000
--- a/src/video_engine.gyp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
- 'includes': [
- 'common_settings.gypi', # Common settings
- 'video_engine/main/test/AutoTest/vie_auto_test.gypi',
- ],
- 'variables': {
- 'autotest_name': 'vie_auto_test',
- },
- 'targets': [
- {
- 'target_name': 'merged_lib',
- 'type': 'none',
- 'dependencies': [
- '<(autotest_name)',
- ],
- 'actions': [
- {
- 'variables': {
- 'output_lib_name': 'webrtc',
- 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
- },
- 'action_name': 'merge_libs',
- 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
- 'outputs': ['<(output_lib)'],
- 'action': ['python',
- './build/merge_libs.py',
- '<(PRODUCT_DIR)',
- '<(output_lib)'],
- },
- ],
- },
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/video_engine/main/source/video_engine_core.gyp b/src/video_engine/main/source/video_engine_core.gypi
similarity index 69%
rename from src/video_engine/main/source/video_engine_core.gyp
rename to src/video_engine/main/source/video_engine_core.gypi
index 6f444d6..5ce804a 100644
--- a/src/video_engine/main/source/video_engine_core.gyp
+++ b/src/video_engine/main/source/video_engine_core.gypi
@@ -1,37 +1,38 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../common_settings.gypi', # Common settings
- ],
'targets': [
{
'target_name': 'video_engine_core',
'type': '<(library)',
'dependencies': [
- ## common_video
- '../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
- '../../../common_video/jpeg/main/source/jpeg.gyp:webrtc_jpeg',
+ # common_video
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_vplib',
+ '<(webrtc_root)/common_video/common_video.gyp:webrtc_jpeg',
- ## ModulesShared
- '../../../modules/media_file/source/media_file.gyp:media_file',
- '../../../modules/rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp',
- '../../../modules/udp_transport/source/udp_transport.gyp:udp_transport',
- '../../../modules/utility/source/utility.gyp:webrtc_utility',
+ # ModulesShared
+ '<(webrtc_root)/modules/modules.gyp:media_file',
+ '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
+ '<(webrtc_root)/modules/modules.gyp:udp_transport',
+ '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
- ## ModulesVideo
- '../../../modules/video_coding/main/source/video_coding.gyp:webrtc_video_coding',
- '../../../modules/video_processing/main/source/video_processing.gyp:video_processing',
- '../../../modules/video_render/main/source/video_render.gyp:video_render_module',
+ # ModulesVideo
+ '<(webrtc_root)/modules/modules.gyp:webrtc_video_coding',
+ '<(webrtc_root)/modules/modules.gyp:video_processing',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module',
- ## VoiceEngine
- '../../../voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ # VoiceEngine
+ '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
- ## system_wrappers_2005
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ # system_wrappers
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -104,8 +105,6 @@
'vie_render_impl.cc',
'vie_rtp_rtcp_impl.cc',
'vie_shared_data.cc',
-
- # ViE
'vie_capturer.cc',
'vie_channel.cc',
'vie_channel_manager.cc',
diff --git a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
index d3a7ea3..cf55225 100644
--- a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
+++ b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
@@ -1,21 +1,47 @@
-# Copyright (c) 2009 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.
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
+ 'variables': {
+ 'autotest_name': 'vie_auto_test',
+ },
'targets': [
{
+ 'target_name': 'merged_lib',
+ 'type': 'none',
+ 'dependencies': [
+ '<(autotest_name)',
+ ],
+ 'actions': [
+ {
+ 'variables': {
+ 'output_lib_name': 'webrtc',
+ 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
+ },
+ 'action_name': 'merge_libs',
+ 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
+ 'outputs': ['<(output_lib)'],
+ 'action': ['python',
+ '../build/merge_libs.py',
+ '<(PRODUCT_DIR)',
+ '<(output_lib)'],
+ },
+ ],
+ },
+ {
'target_name': '<(autotest_name)',
'type': 'executable',
'dependencies': [
- 'system_wrappers/source/system_wrappers.gyp:system_wrappers',
- 'modules/video_render/main/source/video_render.gyp:video_render_module',
- 'modules/video_capture/main/source/video_capture.gyp:video_capture_module',
- 'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
- 'video_engine/main/source/video_engine_core.gyp:video_engine_core',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module',
+ '<(webrtc_root)/modules/modules.gyp:video_capture_module',
+ '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
+ 'video_engine_core',
],
'include_dirs': [
'interface/',
@@ -89,7 +115,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'video_engine/main/test/WindowsTest/windowstest.gyp:vie_win_test',
+ 'vie_win_test',
],
}],
@@ -137,7 +163,7 @@
],
'action': [
'/bin/sh', '-c',
- 'cp -f video_engine/main/test/AutoTest/media/* /tmp/',
+ 'cp -f main/test/AutoTest/media/* /tmp/',
],
},
],
@@ -155,7 +181,7 @@
],
'action': [
'cmd', '/c',
- 'xcopy /Y /R video_engine\\main\\test\\AutoTest\\media\\* \\tmp',
+ 'xcopy /Y /R main\\test\\AutoTest\\media\\* \\tmp',
],
},
],
diff --git a/src/video_engine/main/test/WindowsTest/windowstest.gyp b/src/video_engine/main/test/WindowsTest/windowstest.gypi
similarity index 71%
rename from src/video_engine/main/test/WindowsTest/windowstest.gyp
rename to src/video_engine/main/test/WindowsTest/windowstest.gypi
index 28d1432..ae782de 100644
--- a/src/video_engine/main/test/WindowsTest/windowstest.gyp
+++ b/src/video_engine/main/test/WindowsTest/windowstest.gypi
@@ -1,7 +1,12 @@
+# 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': [
- '../../../../common_settings.gypi', # Common settings
- ],
'conditions': [
['OS=="win"', {
'targets': [
@@ -10,13 +15,13 @@
'target_name': 'vie_win_test',
'type': 'executable',
'dependencies': [
- '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', # need the headers
- '../../../../modules/video_render/main/source/video_render.gyp:video_render_module',
- '../../../../modules/video_capture/main/source/video_capture.gyp:video_capture_module',
+ '<(webrtc_root)/modules/modules.gyp:video_render_module',
+ '<(webrtc_root)/modules/modules.gyp:video_capture_module',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
## VoiceEngine
- '../../../../voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
## VideoEngine
- '../../source/video_engine_core.gyp:video_engine_core',
+ 'video_engine_core',
],
'include_dirs': [
'./interface',
diff --git a/src/video_engine/video_engine.gyp b/src/video_engine/video_engine.gyp
new file mode 100644
index 0000000..c10926a
--- /dev/null
+++ b/src/video_engine/video_engine.gyp
@@ -0,0 +1,25 @@
+# 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': [
+ '../common_settings.gypi', # Common settings
+ 'main/source/video_engine_core.gypi',
+ ],
+
+ # Test targets, excluded when building with chromium.
+ 'conditions': [
+ ['build_with_chromium==0', {
+ 'includes': [
+ 'main/test/AutoTest/vie_auto_test.gypi',
+ 'main/test/WindowsTest/windowstest.gypi',
+ ], # includes
+ }], # build_with_chromium
+ ], # conditions
+}
+
diff --git a/src/voice_engine.gyp b/src/voice_engine.gyp
deleted file mode 100644
index 86e6df4..0000000
--- a/src/voice_engine.gyp
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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': [
- 'common_settings.gypi',
- ],
- 'variables': {
- 'autotest_name': 'voe_auto_test',
- },
- 'targets': [
- {
- 'target_name': 'merged_lib_voice',
- 'type': 'none',
- 'dependencies': [
- '<(autotest_name)',
- ],
- 'actions': [
- {
- 'variables': {
- 'output_lib_name': 'webrtc_voice_engine',
- 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
- },
- 'action_name': 'merge_libs',
- 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
- 'outputs': ['<(output_lib)'],
- 'action': ['python',
- './build/merge_libs.py',
- '<(PRODUCT_DIR)',
- '<(output_lib)'],
- },
- ],
- },
- # Auto test - command line test for all platforms
- {
- 'target_name': '<(autotest_name)',
- 'type': 'executable',
- 'dependencies': [
- 'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
- 'system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
- 'include_dirs': [
- 'voice_engine/main/test/auto_test',
- 'modules/interface',
- 'modules/audio_device/main/interface',
- ],
- 'sources': [
- 'voice_engine/main/test/auto_test/voe_cpu_test.cc',
- 'voice_engine/main/test/auto_test/voe_cpu_test.h',
- 'voice_engine/main/test/auto_test/voe_extended_test.cc',
- 'voice_engine/main/test/auto_test/voe_extended_test.h',
- 'voice_engine/main/test/auto_test/voe_standard_test.cc',
- 'voice_engine/main/test/auto_test/voe_standard_test.h',
- 'voice_engine/main/test/auto_test/voe_stress_test.cc',
- 'voice_engine/main/test/auto_test/voe_stress_test.h',
- 'voice_engine/main/test/auto_test/voe_test_defines.h',
- 'voice_engine/main/test/auto_test/voe_test_interface.h',
- 'voice_engine/main/test/auto_test/voe_unit_test.cc',
- 'voice_engine/main/test/auto_test/voe_unit_test.h',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'voice_engine.gyp:voe_ui_win_test',
- ],
- }],
- ],
- },
- {
- # command line test that should work on linux/mac/win
- 'target_name': 'voe_cmd_test',
- 'type': 'executable',
- 'dependencies': [
- '../testing/gtest.gyp:gtest',
- 'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
- 'system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
- 'sources': [
- 'voice_engine/main/test/cmd_test/voe_cmd_test.cc',
- ],
- },
- ],
- 'conditions': [
- ['OS=="win"', {
- 'targets': [
- # WinTest - GUI test for Windows
- {
- 'target_name': 'voe_ui_win_test',
- 'type': 'executable',
- 'dependencies': [
- 'voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
- 'system_wrappers/source/system_wrappers.gyp:system_wrappers',
- ],
- 'include_dirs': [
- 'voice_engine/main/test/win_test',
- ],
- 'sources': [
- 'voice_engine/main/test/win_test/Resource.h',
- 'voice_engine/main/test/win_test/WinTest.cpp',
- 'voice_engine/main/test/win_test/WinTest.h',
- 'voice_engine/main/test/win_test/WinTest.rc',
- 'voice_engine/main/test/win_test/WinTestDlg.cpp',
- 'voice_engine/main/test/win_test/WinTestDlg.h',
- 'voice_engine/main/test/win_test/res/WinTest.ico',
- 'voice_engine/main/test/win_test/res/WinTest.rc2',
- 'voice_engine/main/test/win_test/stdafx.cpp',
- 'voice_engine/main/test/win_test/stdafx.h',
- ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_configuration_attributes': {
- 'conditions': [
- ['component=="shared_library"', {
- 'UseOfMFC': '2', # Shared DLL
- },{
- 'UseOfMFC': '1', # Static
- }],
- ],
- },
- },
- },
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': '2', # Windows
- },
- },
- },
- ],
- }],
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/voice_engine/main/source/voice_engine_core.gyp b/src/voice_engine/main/source/voice_engine_core.gypi
similarity index 76%
rename from src/voice_engine/main/source/voice_engine_core.gyp
rename to src/voice_engine/main/source/voice_engine_core.gypi
index ef7739f..59d8c92 100644
--- a/src/voice_engine/main/source/voice_engine_core.gyp
+++ b/src/voice_engine/main/source/voice_engine_core.gypi
@@ -7,30 +7,27 @@
# be found in the AUTHORS file in the root of the source tree.
{
- 'includes': [
- '../../../common_settings.gypi',
- ],
'targets': [
{
'target_name': 'voice_engine_core',
'type': '<(library)',
'dependencies': [
- '../../../common_audio/resampler/main/source/resampler.gyp:resampler',
- '../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
- '../../../modules/audio_coding/main/source/audio_coding_module.gyp:audio_coding_module',
- '../../../modules/audio_conference_mixer/source/audio_conference_mixer.gyp:audio_conference_mixer',
- '../../../modules/audio_device/main/source/audio_device.gyp:audio_device',
- '../../../modules/audio_processing/main/source/apm.gyp:audio_processing',
- '../../../modules/media_file/source/media_file.gyp:media_file',
- '../../../modules/rtp_rtcp/source/rtp_rtcp.gyp:rtp_rtcp',
- '../../../modules/udp_transport/source/udp_transport.gyp:udp_transport',
- '../../../modules/utility/source/utility.gyp:webrtc_utility',
- '../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
+ '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+ '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
+ '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
+ '<(webrtc_root)/modules/modules.gyp:audio_device',
+ '<(webrtc_root)/modules/modules.gyp:audio_processing',
+ '<(webrtc_root)/modules/modules.gyp:media_file',
+ '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
+ '<(webrtc_root)/modules/modules.gyp:udp_transport',
+ '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../../..',
'../interface',
- '../../../modules/audio_device/main/source',
+ '<(webrtc_root)/modules/audio_device/main/source',
],
'direct_dependent_settings': {
'include_dirs': [
diff --git a/src/voice_engine/main/test/voice_engine_tests.gypi b/src/voice_engine/main/test/voice_engine_tests.gypi
new file mode 100644
index 0000000..096d226
--- /dev/null
+++ b/src/voice_engine/main/test/voice_engine_tests.gypi
@@ -0,0 +1,139 @@
+# 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.
+
+{
+ 'variables': {
+ 'autotest_name': 'voe_auto_test',
+ },
+ 'targets': [
+ {
+ 'target_name': 'merged_lib_voice',
+ 'type': 'none',
+ 'dependencies': [
+ '<(autotest_name)',
+ ],
+ 'actions': [
+ {
+ 'variables': {
+ 'output_lib_name': 'webrtc_voice_engine',
+ 'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)_<(OS)<(STATIC_LIB_SUFFIX)',
+ },
+ 'action_name': 'merge_libs',
+ 'inputs': ['<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)<(autotest_name)<(EXECUTABLE_SUFFIX)'],
+ 'outputs': ['<(output_lib)'],
+ 'action': ['python',
+ '../build/merge_libs.py',
+ '<(PRODUCT_DIR)',
+ '<(output_lib)'],
+ },
+ ],
+ },
+ # Auto test - command line test for all platforms
+ {
+ 'target_name': '<(autotest_name)',
+ 'type': 'executable',
+ 'dependencies': [
+ 'voice_engine_core',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ ],
+ 'include_dirs': [
+ 'auto_test',
+ '<(webrtc_root)/modules/interface',
+ '<(webrtc_root)/modules/audio_device/main/interface',
+ ],
+ 'sources': [
+ 'auto_test/voe_cpu_test.cc',
+ 'auto_test/voe_cpu_test.h',
+ 'auto_test/voe_extended_test.cc',
+ 'auto_test/voe_extended_test.h',
+ 'auto_test/voe_standard_test.cc',
+ 'auto_test/voe_standard_test.h',
+ 'auto_test/voe_stress_test.cc',
+ 'auto_test/voe_stress_test.h',
+ 'auto_test/voe_test_defines.h',
+ 'auto_test/voe_test_interface.h',
+ 'auto_test/voe_unit_test.cc',
+ 'auto_test/voe_unit_test.h',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ 'voice_engine.gyp:voe_ui_win_test',
+ ],
+ }],
+ ],
+ },
+ {
+ # command line test that should work on linux/mac/win
+ 'target_name': 'voe_cmd_test',
+ 'type': 'executable',
+ 'dependencies': [
+ '<(webrtc_root)/../testing/gtest.gyp:gtest',
+ 'voice_engine_core',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ ],
+ 'sources': [
+ 'cmd_test/voe_cmd_test.cc',
+ ],
+ },
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'targets': [
+ # WinTest - GUI test for Windows
+ {
+ 'target_name': 'voe_ui_win_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'voice_engine_core',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ ],
+ 'include_dirs': [
+ 'win_test',
+ ],
+ 'sources': [
+ 'win_test/Resource.h',
+ 'win_test/WinTest.cpp',
+ 'win_test/WinTest.h',
+ 'win_test/WinTest.rc',
+ 'win_test/WinTestDlg.cpp',
+ 'win_test/WinTestDlg.h',
+ 'win_test/res/WinTest.ico',
+ 'win_test/res/WinTest.rc2',
+ 'win_test/stdafx.cpp',
+ 'win_test/stdafx.h',
+ ],
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_configuration_attributes': {
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'UseOfMFC': '2', # Shared DLL
+ },{
+ 'UseOfMFC': '1', # Static
+ }],
+ ],
+ },
+ },
+ },
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '2', # Windows
+ },
+ },
+ },
+ ],
+ }],
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/src/voice_engine/voice_engine.gyp b/src/voice_engine/voice_engine.gyp
new file mode 100644
index 0000000..d235a81
--- /dev/null
+++ b/src/voice_engine/voice_engine.gyp
@@ -0,0 +1,23 @@
+# 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': [
+ '../common_settings.gypi', # Common settings
+ 'main/source/voice_engine_core.gypi',
+ ],
+
+ # Test targets, excluded when building with chromium.
+ 'conditions': [
+ ['build_with_chromium==0', {
+ 'includes': [
+ 'main/test/voice_engine_tests.gypi',
+ ], # includes
+ }], # build_with_chromium
+ ], # conditions
+}
diff --git a/third_party_mods/libjingle/libjingle.gyp b/third_party_mods/libjingle/libjingle.gyp
index b207b06..f048e04 100644
--- a/third_party_mods/libjingle/libjingle.gyp
+++ b/third_party_mods/libjingle/libjingle.gyp
@@ -530,22 +530,22 @@
}],
['inside_chromium_build==1', {
'dependencies': [
- '../../third_party/webrtc/modules/audio_device/main/source/audio_device.gyp:audio_device',
- '../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
- '../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
+ '../../third_party/webrtc/modules/modules.gyp:audio_device',
+ '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
+ '../../third_party/webrtc/modules/modules.gyp:video_render_module',
'../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
- '../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
+ '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
'libjingle',
],
}, {
'dependencies': [
- '../../src/modules/audio_device/main/source/audio_device.gyp:audio_device',
- '../../src/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
- '../../src/modules/video_render/main/source/video_render.gyp:video_render_module',
+ '../../src/modules/modules.gyp:audio_device',
+ '../../src/modules/modules.gyp:video_capture_module',
+ '../../src/modules/modules.gyp:video_render_module',
'../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '../../src/video_engine/main/source/video_engine_core.gyp:video_engine_core',
- '../../src/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ '../../src/video_engine/video_engine.gyp:video_engine_core',
+ '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
'libjingle',
],
} ], # inside_chromium_build
@@ -578,19 +578,19 @@
'conditions': [
['inside_chromium_build==1', {
'dependencies': [
- '../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
- '../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
- '../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
- '../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
+ '../../third_party/webrtc/modules/modules.gyp:video_render_module',
+ '../../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
+ '../../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
'../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'libjingle_p2p',
],
}, {
'dependencies': [
- '../../src/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
- '../../src/modules/video_render/main/source/video_render.gyp:video_render_module',
- '../../src/video_engine/main/source/video_engine_core.gyp:video_engine_core',
- '../../src/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+ '../../src/modules/modules.gyp:video_capture_module',
+ '../../src/modules/modules.gyp:video_render_module',
+ '../../src/video_engine/video_engine.gyp:video_engine_core',
+ '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
'../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'libjingle_p2p',
],
diff --git a/webrtc.gyp b/webrtc.gyp
index df0e22b..55f5ea9 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -15,15 +15,15 @@
'target_name': 'auto_tests',
'type': 'none',
'dependencies': [
- 'src/voice_engine.gyp:voe_auto_test',
- 'src/video_engine.gyp:vie_auto_test',
+ 'src/voice_engine/voice_engine.gyp:voe_auto_test',
+ 'src/video_engine/video_engine.gyp:vie_auto_test',
],
},
{
'target_name': 'cmd_test',
'type': 'none',
'dependencies': [
- 'src/voice_engine.gyp:voe_cmd_test',
+ 'src/voice_engine/voice_engine.gyp:voe_cmd_test',
],
},
{