Rename targets to use lower case format.

It makes writing a build script for merging libraries
across architectures easier. See talk/build/build_ios_libs.sh.

BUG=
R=andrew@webrtc.org, kjellander@webrtc.org

Review URL: https://codereview.webrtc.org/1171793002.

Cr-Commit-Position: refs/heads/master@{#9412}
This commit is contained in:
Zeke Chin 2015-06-10 13:45:08 -07:00
parent 9345e86551
commit 786dbdcc38
16 changed files with 84 additions and 84 deletions

View File

@ -64,7 +64,7 @@ source_set("audio_coding") {
":g722", ":g722",
":ilbc", ":ilbc",
":isac", ":isac",
":isacfix", ":isac_fix",
":neteq", ":neteq",
":pcm16b", ":pcm16b",
":red", ":red",
@ -469,7 +469,7 @@ config("isac_fix_config") {
] ]
} }
source_set("isacfix") { source_set("isac_fix") {
sources = [ sources = [
"codecs/isac/audio_encoder_isac_t.h", "codecs/isac/audio_encoder_isac_t.h",
"codecs/isac/audio_encoder_isac_t_impl.h", "codecs/isac/audio_encoder_isac_t_impl.h",
@ -776,7 +776,7 @@ source_set("neteq") {
":g722", ":g722",
":ilbc", ":ilbc",
":isac", ":isac",
":isacfix", ":isac_fix",
":pcm16b", ":pcm16b",
"../..:webrtc_common", "../..:webrtc_common",
"../../common_audio", "../../common_audio",

View File

@ -18,7 +18,7 @@
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'dependencies': [ 'dependencies': [
'audio_processing', 'audio_processing',
'iSACFix', 'isac_fix',
'webrtc_opus', 'webrtc_opus',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',

View File

@ -9,7 +9,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'CNG', 'target_name': 'cng',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',

View File

@ -9,7 +9,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'G711', 'target_name': 'g711',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'audio_encoder_interface', 'audio_encoder_interface',
@ -41,7 +41,7 @@
'target_name': 'g711_test', 'target_name': 'g711_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'G711', 'g711',
], ],
'sources': [ 'sources': [
'test/testG711.cc', 'test/testG711.cc',

View File

@ -8,7 +8,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'G722', 'target_name': 'g722',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'audio_encoder_interface', 'audio_encoder_interface',
@ -38,10 +38,10 @@
['include_tests==1', { ['include_tests==1', {
'targets': [ 'targets': [
{ {
'target_name': 'G722Test', 'target_name': 'g722_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'G722', 'g722',
], ],
'sources': [ 'sources': [
'test/testG722.cc', 'test/testG722.cc',

View File

@ -9,7 +9,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'iLBC', 'target_name': 'ilbc',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
@ -168,21 +168,21 @@
'window32_w32.h', 'window32_w32.h',
'xcorr_coef.h', 'xcorr_coef.h',
], # sources ], # sources
}, # iLBC }, # ilbc
], # targets ], # targets
'conditions': [ 'conditions': [
['include_tests==1', { ['include_tests==1', {
'targets': [ 'targets': [
{ {
'target_name': 'iLBCtest', 'target_name': 'ilbc_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'iLBC', 'ilbc',
], ],
'sources': [ 'sources': [
'test/iLBC_test.c', 'test/iLBC_test.c',
], ],
}, # iLBCtest }, # ilbc_test
], # targets ], # targets
}], # include_tests }], # include_tests
], # conditions ], # conditions

View File

@ -9,7 +9,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'iSAC', 'target_name': 'isac',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',

View File

@ -10,10 +10,10 @@
'targets': [ 'targets': [
# simple kenny # simple kenny
{ {
'target_name': 'iSACtest', 'target_name': 'isac_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'iSAC', 'isac',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',
@ -28,10 +28,10 @@
}, },
# ReleaseTest-API # ReleaseTest-API
{ {
'target_name': 'iSACAPITest', 'target_name': 'isac_api_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'iSAC', 'isac',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',
@ -46,10 +46,10 @@
}, },
# SwitchingSampRate # SwitchingSampRate
{ {
'target_name': 'iSACSwitchSampRateTest', 'target_name': 'isac_switch_samprate_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'iSAC', 'isac',
], ],
'include_dirs': [ 'include_dirs': [
'./main/test', './main/test',
@ -61,7 +61,7 @@
'sources': [ 'sources': [
'./main/test/SwitchingSampRate/SwitchingSampRate.cc', './main/test/SwitchingSampRate/SwitchingSampRate.cc',
'./main/util/utility.c', './main/util/utility.c',
], ],
}, },
], ],

View File

@ -9,7 +9,7 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'iSACFix', 'target_name': 'isac_fix',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',

View File

@ -10,10 +10,10 @@
'targets': [ 'targets': [
# kenny # kenny
{ {
'target_name': 'iSACFixtest', 'target_name': 'isac_fix_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'iSACFix', 'isac_fix',
'<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/test/test.gyp:test_support',
], ],
'include_dirs': [ 'include_dirs': [

View File

@ -9,11 +9,11 @@
{ {
'targets': [ 'targets': [
{ {
'target_name': 'PCM16B', 'target_name': 'pcm16b',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'audio_encoder_interface', 'audio_encoder_interface',
'G711', 'g711',
], ],
'include_dirs': [ 'include_dirs': [
'include', 'include',

View File

@ -9,13 +9,13 @@
{ {
'variables': { 'variables': {
'audio_coding_dependencies': [ 'audio_coding_dependencies': [
'CNG', 'cng',
'G711', 'g711',
'G722', 'g722',
'iLBC', 'ilbc',
'iSAC', 'isac',
'iSACFix', 'isac_fix',
'PCM16B', 'pcm16b',
'red', 'red',
'<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',

View File

@ -9,13 +9,13 @@
{ {
'variables': { 'variables': {
'codecs': [ 'codecs': [
'G711', 'cng',
'G722', 'g711',
'PCM16B', 'g722',
'iLBC', 'ilbc',
'iSAC', 'isac',
'iSACFix', 'isac_fix',
'CNG', 'pcm16b',
], ],
'neteq_defines': [], 'neteq_defines': [],
'conditions': [ 'conditions': [

View File

@ -12,11 +12,11 @@
'target_name': 'neteq_rtpplay', 'target_name': 'neteq_rtpplay',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main',
'neteq', 'neteq',
'neteq_unittest_tools', 'neteq_unittest_tools',
'PCM16B', 'pcm16b',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
], ],
'sources': [ 'sources': [
'tools/neteq_rtpplay.cc', 'tools/neteq_rtpplay.cc',
@ -30,14 +30,14 @@
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
# TODO(hlundin): Make RTPencode use ACM to encode files. # TODO(hlundin): Make RTPencode use ACM to encode files.
'neteq_test_tools',# Test helpers
'G711',
'G722',
'PCM16B',
'iLBC',
'iSAC',
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'cng',
'g711',
'g722',
'ilbc',
'isac',
'neteq_test_tools', # Test helpers
'pcm16b',
], ],
'defines': [ 'defines': [
'CODEC_ILBC', 'CODEC_ILBC',
@ -84,10 +84,10 @@
'target_name': 'rtp_analyze', 'target_name': 'rtp_analyze',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq_unittest_tools',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
'neteq_unittest_tools',
], ],
'sources': [ 'sources': [
'tools/rtp_analyze.cc', 'tools/rtp_analyze.cc',
@ -98,8 +98,8 @@
'target_name': 'RTPchange', 'target_name': 'RTPchange',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq_test_tools',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'neteq_test_tools',
], ],
'sources': [ 'sources': [
'test/RTPchange.cc', 'test/RTPchange.cc',
@ -110,8 +110,8 @@
'target_name': 'RTPtimeshift', 'target_name': 'RTPtimeshift',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq_test_tools',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'neteq_test_tools',
], ],
'sources': [ 'sources': [
'test/RTPtimeshift.cc', 'test/RTPtimeshift.cc',
@ -134,8 +134,8 @@
'target_name': 'rtp_to_text', 'target_name': 'rtp_to_text',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq_test_tools',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'neteq_test_tools',
], ],
'sources': [ 'sources': [
'test/rtp_to_text.cc', 'test/rtp_to_text.cc',
@ -158,11 +158,11 @@
'target_name': 'neteq_test_support', 'target_name': 'neteq_test_support',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'neteq',
'PCM16B',
'neteq_unittest_tools',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'neteq',
'neteq_unittest_tools',
'pcm16b',
], ],
'sources': [ 'sources': [
'tools/neteq_external_decoder_test.cc', 'tools/neteq_external_decoder_test.cc',
@ -178,10 +178,10 @@
'target_name': 'neteq_speed_test', 'target_name': 'neteq_speed_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq',
'neteq_test_support',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
'neteq',
'neteq_test_support',
], ],
'sources': [ 'sources': [
'test/neteq_speed_test.cc', 'test/neteq_speed_test.cc',
@ -192,12 +192,12 @@
'target_name': 'neteq_opus_quality_test', 'target_name': 'neteq_opus_quality_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq',
'neteq_test_support',
'webrtc_opus',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
'neteq',
'neteq_test_support',
'webrtc_opus',
], ],
'sources': [ 'sources': [
'test/neteq_opus_quality_test.cc', 'test/neteq_opus_quality_test.cc',
@ -208,12 +208,12 @@
'target_name': 'neteq_isac_quality_test', 'target_name': 'neteq_isac_quality_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq',
'neteq_test_support',
'iSACFix',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
'isac_fix',
'neteq',
'neteq_test_support',
], ],
'sources': [ 'sources': [
'test/neteq_isac_quality_test.cc', 'test/neteq_isac_quality_test.cc',
@ -224,12 +224,12 @@
'target_name': 'neteq_pcmu_quality_test', 'target_name': 'neteq_pcmu_quality_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq',
'neteq_test_support',
'G711',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
'g711',
'neteq',
'neteq_test_support',
], ],
'sources': [ 'sources': [
'test/neteq_pcmu_quality_test.cc', 'test/neteq_pcmu_quality_test.cc',
@ -240,12 +240,12 @@
'target_name': 'neteq_ilbc_quality_test', 'target_name': 'neteq_ilbc_quality_test',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'neteq',
'neteq_test_support',
'iLBC',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
'neteq',
'neteq_test_support',
'ilbc',
], ],
'sources': [ 'sources': [
'test/neteq_ilbc_quality_test.cc', 'test/neteq_ilbc_quality_test.cc',
@ -261,14 +261,14 @@
'neteq_dummy_rtp%': 0, 'neteq_dummy_rtp%': 0,
}, },
'dependencies': [ 'dependencies': [
'G711',
'G722',
'PCM16B',
'iLBC',
'iSAC',
'CNG',
'<(webrtc_root)/common.gyp:webrtc_common',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common.gyp:webrtc_common',
'cng',
'g711',
'g722',
'ilbc',
'isac',
'pcm16b',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [

View File

@ -28,7 +28,7 @@
'<(webrtc_root)/base/base.gyp:rtc_base_approved', '<(webrtc_root)/base/base.gyp:rtc_base_approved',
'<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
'<(webrtc_root)/modules/modules.gyp:iSAC', '<(webrtc_root)/modules/modules.gyp:isac',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
], ],
'sources': [ 'sources': [

View File

@ -62,15 +62,15 @@
'audioproc_test_utils', 'audioproc_test_utils',
'bitrate_controller', 'bitrate_controller',
'bwe_simulator', 'bwe_simulator',
'CNG', 'cng',
'desktop_capture', 'desktop_capture',
'iSACFix', 'isac_fix',
'media_file', 'media_file',
'neteq', 'neteq',
'neteq_test_support', 'neteq_test_support',
'neteq_unittest_tools', 'neteq_unittest_tools',
'paced_sender', 'paced_sender',
'PCM16B', # Needed by NetEq tests. 'pcm16b', # Needed by NetEq tests.
'red', 'red',
'remote_bitrate_estimator', 'remote_bitrate_estimator',
'rtp_rtcp', 'rtp_rtcp',