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
This commit is contained in:
xians@google.com
2011-09-12 12:24:39 +00:00
parent 0cc68dc38a
commit d3185fe219
59 changed files with 634 additions and 588 deletions

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',

View File

@@ -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',
],
}],
],

View File

@@ -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',

View File

@@ -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',