Remove '<(library)' in gyp files.
This will remove all usage of '<(library)' in all webrtc gyp files.
Review URL: https://webrtc-codereview.appspot.com/1049005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3392 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/common_audio/resampler/resampler.gypi b/common_audio/resampler/resampler.gypi
index 75997fd..4d7fdd0 100644
--- a/common_audio/resampler/resampler.gypi
+++ b/common_audio/resampler/resampler.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'resampler',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'signal_processing',
],
diff --git a/common_audio/signal_processing/signal_processing.gypi b/common_audio/signal_processing/signal_processing.gypi
index 91592ea..929569d 100644
--- a/common_audio/signal_processing/signal_processing.gypi
+++ b/common_audio/signal_processing/signal_processing.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'signal_processing',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'include',
],
@@ -109,7 +109,7 @@
'targets': [
{
'target_name': 'signal_processing_neon',
- 'type': '<(library)',
+ 'type': 'static_library',
'includes': ['../../build/arm_neon.gypi',],
'sources': [
'cross_correlation_neon.S',
diff --git a/common_audio/vad/vad.gypi b/common_audio/vad/vad.gypi
index 5a9466c..1952c6c 100644
--- a/common_audio/vad/vad.gypi
+++ b/common_audio/vad/vad.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'vad',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'signal_processing',
],
diff --git a/modules/audio_coding/codecs/cng/cng.gypi b/modules/audio_coding/codecs/cng/cng.gypi
index d44a7f4..16b49ef 100644
--- a/modules/audio_coding/codecs/cng/cng.gypi
+++ b/modules/audio_coding/codecs/cng/cng.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'CNG',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
],
diff --git a/modules/audio_coding/codecs/g711/g711.gypi b/modules/audio_coding/codecs/g711/g711.gypi
index ca33020..4abe945 100644
--- a/modules/audio_coding/codecs/g711/g711.gypi
+++ b/modules/audio_coding/codecs/g711/g711.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'G711',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'include',
],
diff --git a/modules/audio_coding/codecs/g722/g722.gypi b/modules/audio_coding/codecs/g722/g722.gypi
index 8dc3509..c9d91fb 100644
--- a/modules/audio_coding/codecs/g722/g722.gypi
+++ b/modules/audio_coding/codecs/g722/g722.gypi
@@ -9,7 +9,7 @@
'targets': [
{
'target_name': 'G722',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'include',
],
diff --git a/modules/audio_coding/codecs/ilbc/ilbc.gypi b/modules/audio_coding/codecs/ilbc/ilbc.gypi
index 89ae27d..3b937ce 100644
--- a/modules/audio_coding/codecs/ilbc/ilbc.gypi
+++ b/modules/audio_coding/codecs/ilbc/ilbc.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'iLBC',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
],
diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
index 4a51158..88a85da 100644
--- a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'iSACFix',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
@@ -91,7 +91,7 @@
'targets': [
{
'target_name': 'isac_neon',
- 'type': '<(library)',
+ 'type': 'static_library',
'includes': ['../../../../../../build/arm_neon.gypi',],
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
diff --git a/modules/audio_coding/codecs/isac/main/source/isac.gypi b/modules/audio_coding/codecs/isac/main/source/isac.gypi
index d30be55..e2a6fa6 100644
--- a/modules/audio_coding/codecs/isac/main/source/isac.gypi
+++ b/modules/audio_coding/codecs/isac/main/source/isac.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'iSAC',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
],
diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
index 6f6eea6..73c69a9 100644
--- a/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ b/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'PCM16B',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'include',
],
diff --git a/modules/audio_coding/main/source/audio_coding_module.gypi b/modules/audio_coding/main/source/audio_coding_module.gypi
index efa9c61..cbe2ce6 100644
--- a/modules/audio_coding/main/source/audio_coding_module.gypi
+++ b/modules/audio_coding/main/source/audio_coding_module.gypi
@@ -33,7 +33,7 @@
'targets': [
{
'target_name': 'audio_coding_module',
- 'type': '<(library)',
+ 'type': 'static_library',
'defines': [
'<@(audio_coding_defines)',
],
diff --git a/modules/audio_coding/neteq/neteq.gypi b/modules/audio_coding/neteq/neteq.gypi
index 8bc35d0..88c8260 100644
--- a/modules/audio_coding/neteq/neteq.gypi
+++ b/modules/audio_coding/neteq/neteq.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'NetEq',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
@@ -244,7 +244,7 @@
{
'target_name': 'NetEqTestTools',
# Collection of useful functions used in other tests
- 'type': '<(library)',
+ 'type': 'static_library',
'variables': {
# Expects RTP packets without payloads when enabled.
'neteq_dummy_rtp%': 0,
diff --git a/modules/audio_conference_mixer/source/audio_conference_mixer.gypi b/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
index 75fc2dd..a40d518 100644
--- a/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
+++ b/modules/audio_conference_mixer/source/audio_conference_mixer.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'audio_conference_mixer',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'audio_processing',
'webrtc_utility',
diff --git a/modules/audio_device/audio_device.gypi b/modules/audio_device/audio_device.gypi
index 640f732..3865c33 100644
--- a/modules/audio_device/audio_device.gypi
+++ b/modules/audio_device/audio_device.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'audio_device',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
diff --git a/modules/bitrate_controller/bitrate_controller.gypi b/modules/bitrate_controller/bitrate_controller.gypi
index 2db5fcb..a8ca938 100644
--- a/modules/bitrate_controller/bitrate_controller.gypi
+++ b/modules/bitrate_controller/bitrate_controller.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'bitrate_controller',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
diff --git a/modules/media_file/source/media_file.gypi b/modules/media_file/source/media_file.gypi
index f94a618..084a023 100644
--- a/modules/media_file/source/media_file.gypi
+++ b/modules/media_file/source/media_file.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'media_file',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webrtc_utility',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
diff --git a/modules/pacing/pacing.gypi b/modules/pacing/pacing.gypi
index 66b12ec..c226722 100644
--- a/modules/pacing/pacing.gypi
+++ b/modules/pacing/pacing.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'paced_sender',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
index 4ec66f9..a10fbb3 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'remote_bitrate_estimator',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
# system_wrappers
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
diff --git a/modules/rtp_rtcp/source/rtp_rtcp.gypi b/modules/rtp_rtcp/source/rtp_rtcp.gypi
index 0301079..41305a6 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp.gypi
+++ b/modules/rtp_rtcp/source/rtp_rtcp.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'rtp_rtcp',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator',
diff --git a/modules/rtp_rtcp/test/bwe_standalone.gypi b/modules/rtp_rtcp/test/bwe_standalone.gypi
index 36a50de..7bdd162 100644
--- a/modules/rtp_rtcp/test/bwe_standalone.gypi
+++ b/modules/rtp_rtcp/test/bwe_standalone.gypi
@@ -45,7 +45,7 @@
{
'target_name': 'matlab_plotting',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'matlab_plotting_include',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
diff --git a/modules/udp_transport/source/udp_transport.gypi b/modules/udp_transport/source/udp_transport.gypi
index 58c208a..92ade75 100644
--- a/modules/udp_transport/source/udp_transport.gypi
+++ b/modules/udp_transport/source/udp_transport.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'udp_transport',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
diff --git a/modules/utility/source/utility.gypi b/modules/utility/source/utility.gypi
index d4f2f19..61c66df 100644
--- a/modules/utility/source/utility.gypi
+++ b/modules/utility/source/utility.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'webrtc_utility',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'audio_coding_module',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
diff --git a/modules/video_coding/codecs/i420/main/source/i420.gypi b/modules/video_coding/codecs/i420/main/source/i420.gypi
index af13f8d..3e5a55f 100644
--- a/modules/video_coding/codecs/i420/main/source/i420.gypi
+++ b/modules/video_coding/codecs/i420/main/source/i420.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'webrtc_i420',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
diff --git a/modules/video_coding/codecs/test/video_codecs_test_framework.gypi b/modules/video_coding/codecs/test/video_codecs_test_framework.gypi
index 75c82d8..700616a 100644
--- a/modules/video_coding/codecs/test/video_codecs_test_framework.gypi
+++ b/modules/video_coding/codecs/test/video_codecs_test_framework.gypi
@@ -12,7 +12,7 @@
'targets': [
{
'target_name': 'video_codecs_test_framework',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/test/test.gyp:test_support',
],
diff --git a/modules/video_coding/codecs/test_framework/test_framework.gypi b/modules/video_coding/codecs/test_framework/test_framework.gypi
index 438dd2d..9a94dc3 100644
--- a/modules/video_coding/codecs/test_framework/test_framework.gypi
+++ b/modules/video_coding/codecs/test_framework/test_framework.gypi
@@ -12,7 +12,7 @@
'targets': [
{
'target_name': 'test_framework',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
diff --git a/modules/video_coding/codecs/vp8/vp8.gyp b/modules/video_coding/codecs/vp8/vp8.gyp
index 0e751a2..196de43 100644
--- a/modules/video_coding/codecs/vp8/vp8.gyp
+++ b/modules/video_coding/codecs/vp8/vp8.gyp
@@ -23,7 +23,7 @@
'targets': [
{
'target_name': 'webrtc_vp8',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
diff --git a/modules/video_coding/main/source/video_coding.gypi b/modules/video_coding/main/source/video_coding.gypi
index c995072..2b9d4bd 100644
--- a/modules/video_coding/main/source/video_coding.gypi
+++ b/modules/video_coding/main/source/video_coding.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'webrtc_video_coding',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webrtc_i420',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
diff --git a/modules/video_processing/main/source/video_processing.gypi b/modules/video_processing/main/source/video_processing.gypi
index 8d70a79..cf8ef9c 100644
--- a/modules/video_processing/main/source/video_processing.gypi
+++ b/modules/video_processing/main/source/video_processing.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'video_processing',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webrtc_utility',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
@@ -62,7 +62,7 @@
'targets': [
{
'target_name': 'video_processing_sse2',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
'content_analysis_sse2.cc',
],
diff --git a/system_wrappers/source/system_wrappers.gyp b/system_wrappers/source/system_wrappers.gyp
index 02e1a4a..70ed502 100644
--- a/system_wrappers/source/system_wrappers.gyp
+++ b/system_wrappers/source/system_wrappers.gyp
@@ -11,7 +11,7 @@
'targets': [
{
'target_name': 'system_wrappers',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'spreadsortlib',
'../interface',
@@ -198,7 +198,7 @@
'chromium_code': 0,
},
'target_name': 'cpu_features_android',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
# TODO(leozwang): Ideally we want to audomatically exclude .c files
# as with .cc files, gyp currently only excludes .cc files.
diff --git a/test/libtest/libtest.gyp b/test/libtest/libtest.gyp
index ea1ecc7..17b6f03 100644
--- a/test/libtest/libtest.gyp
+++ b/test/libtest/libtest.gyp
@@ -12,7 +12,7 @@
'targets': [
{
'target_name': 'libtest',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
# Helper classes
'include/bit_flip_encryption.h',
diff --git a/test/metrics.gyp b/test/metrics.gyp
index 75567d0..17d9877 100644
--- a/test/metrics.gyp
+++ b/test/metrics.gyp
@@ -18,7 +18,7 @@
# GYP generation would occur, because the libyuv.gypi unittest target
# depends on test_support_main. See issue #160 for more info.
'target_name': 'metrics',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
diff --git a/video_engine/test/libvietest/libvietest.gypi b/video_engine/test/libvietest/libvietest.gypi
index fdfb292..e8f3ac7 100644
--- a/video_engine/test/libvietest/libvietest.gypi
+++ b/video_engine/test/libvietest/libvietest.gypi
@@ -9,7 +9,7 @@
'targets': [
{
'target_name': 'libvietest',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(DEPTH)/testing/gtest.gyp:gtest',
diff --git a/video_engine/video_engine_core.gypi b/video_engine/video_engine_core.gypi
index db287f4..4956b4d 100644
--- a/video_engine/video_engine_core.gypi
+++ b/video_engine/video_engine_core.gypi
@@ -17,7 +17,7 @@
'targets': [
{
'target_name': 'video_engine_core',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
# common_video
diff --git a/voice_engine/voice_engine_core.gypi b/voice_engine/voice_engine_core.gypi
index 40f4c31..3d99be7 100644
--- a/voice_engine/voice_engine_core.gypi
+++ b/voice_engine/voice_engine_core.gypi
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'voice_engine_core',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
