From 786dbdcc38f51ea0b32cc34de17e88dfdfea2fb5 Mon Sep 17 00:00:00 2001 From: Zeke Chin Date: Wed, 10 Jun 2015 13:45:08 -0700 Subject: [PATCH] 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} --- webrtc/modules/audio_coding/BUILD.gn | 6 +- .../audio_coding/audio_coding_tests.gypi | 2 +- .../modules/audio_coding/codecs/cng/cng.gypi | 2 +- .../audio_coding/codecs/g711/g711.gypi | 4 +- .../audio_coding/codecs/g722/g722.gypi | 6 +- .../audio_coding/codecs/ilbc/ilbc.gypi | 10 +-- .../audio_coding/codecs/isac/isac.gypi | 2 +- .../audio_coding/codecs/isac/isac_test.gypi | 14 ++-- .../audio_coding/codecs/isac/isacfix.gypi | 2 +- .../codecs/isac/isacfix_test.gypi | 4 +- .../audio_coding/codecs/pcm16b/pcm16b.gypi | 4 +- .../main/acm2/audio_coding_module.gypi | 14 ++-- webrtc/modules/audio_coding/neteq/neteq.gypi | 14 ++-- .../audio_coding/neteq/neteq_tests.gypi | 76 +++++++++---------- .../audio_processing/audio_processing.gypi | 2 +- webrtc/modules/modules.gyp | 6 +- 16 files changed, 84 insertions(+), 84 deletions(-) diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 896b6641b8..7b7acd34d8 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -64,7 +64,7 @@ source_set("audio_coding") { ":g722", ":ilbc", ":isac", - ":isacfix", + ":isac_fix", ":neteq", ":pcm16b", ":red", @@ -469,7 +469,7 @@ config("isac_fix_config") { ] } -source_set("isacfix") { +source_set("isac_fix") { sources = [ "codecs/isac/audio_encoder_isac_t.h", "codecs/isac/audio_encoder_isac_t_impl.h", @@ -776,7 +776,7 @@ source_set("neteq") { ":g722", ":ilbc", ":isac", - ":isacfix", + ":isac_fix", ":pcm16b", "../..:webrtc_common", "../../common_audio", diff --git a/webrtc/modules/audio_coding/audio_coding_tests.gypi b/webrtc/modules/audio_coding/audio_coding_tests.gypi index 86a92c595d..84ef8673b2 100644 --- a/webrtc/modules/audio_coding/audio_coding_tests.gypi +++ b/webrtc/modules/audio_coding/audio_coding_tests.gypi @@ -18,7 +18,7 @@ 'type': '<(gtest_target_type)', 'dependencies': [ 'audio_processing', - 'iSACFix', + 'isac_fix', 'webrtc_opus', '<(DEPTH)/testing/gtest.gyp:gtest', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', diff --git a/webrtc/modules/audio_coding/codecs/cng/cng.gypi b/webrtc/modules/audio_coding/codecs/cng/cng.gypi index af9fbd3af0..78dc41a94f 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng.gypi +++ b/webrtc/modules/audio_coding/codecs/cng/cng.gypi @@ -9,7 +9,7 @@ { 'targets': [ { - 'target_name': 'CNG', + 'target_name': 'cng', 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.gypi b/webrtc/modules/audio_coding/codecs/g711/g711.gypi index 779f05339a..fc86b18e5f 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711.gypi +++ b/webrtc/modules/audio_coding/codecs/g711/g711.gypi @@ -9,7 +9,7 @@ { 'targets': [ { - 'target_name': 'G711', + 'target_name': 'g711', 'type': 'static_library', 'dependencies': [ 'audio_encoder_interface', @@ -41,7 +41,7 @@ 'target_name': 'g711_test', 'type': 'executable', 'dependencies': [ - 'G711', + 'g711', ], 'sources': [ 'test/testG711.cc', diff --git a/webrtc/modules/audio_coding/codecs/g722/g722.gypi b/webrtc/modules/audio_coding/codecs/g722/g722.gypi index 38dac31231..14b34b7440 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722.gypi +++ b/webrtc/modules/audio_coding/codecs/g722/g722.gypi @@ -8,7 +8,7 @@ { 'targets': [ { - 'target_name': 'G722', + 'target_name': 'g722', 'type': 'static_library', 'dependencies': [ 'audio_encoder_interface', @@ -38,10 +38,10 @@ ['include_tests==1', { 'targets': [ { - 'target_name': 'G722Test', + 'target_name': 'g722_test', 'type': 'executable', 'dependencies': [ - 'G722', + 'g722', ], 'sources': [ 'test/testG722.cc', diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi index 5f6fed1a24..ca4704cc40 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi +++ b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi @@ -9,7 +9,7 @@ { 'targets': [ { - 'target_name': 'iLBC', + 'target_name': 'ilbc', 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', @@ -168,21 +168,21 @@ 'window32_w32.h', 'xcorr_coef.h', ], # sources - }, # iLBC + }, # ilbc ], # targets 'conditions': [ ['include_tests==1', { 'targets': [ { - 'target_name': 'iLBCtest', + 'target_name': 'ilbc_test', 'type': 'executable', 'dependencies': [ - 'iLBC', + 'ilbc', ], 'sources': [ 'test/iLBC_test.c', ], - }, # iLBCtest + }, # ilbc_test ], # targets }], # include_tests ], # conditions diff --git a/webrtc/modules/audio_coding/codecs/isac/isac.gypi b/webrtc/modules/audio_coding/codecs/isac/isac.gypi index 43da73a118..50cc867b23 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isac.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isac.gypi @@ -9,7 +9,7 @@ { 'targets': [ { - 'target_name': 'iSAC', + 'target_name': 'isac', 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', diff --git a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi index a43450e047..4c4a6040e5 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi @@ -10,10 +10,10 @@ 'targets': [ # simple kenny { - 'target_name': 'iSACtest', + 'target_name': 'isac_test', 'type': 'executable', 'dependencies': [ - 'iSAC', + 'isac', ], 'include_dirs': [ './main/test', @@ -28,10 +28,10 @@ }, # ReleaseTest-API { - 'target_name': 'iSACAPITest', + 'target_name': 'isac_api_test', 'type': 'executable', 'dependencies': [ - 'iSAC', + 'isac', ], 'include_dirs': [ './main/test', @@ -46,10 +46,10 @@ }, # SwitchingSampRate { - 'target_name': 'iSACSwitchSampRateTest', + 'target_name': 'isac_switch_samprate_test', 'type': 'executable', 'dependencies': [ - 'iSAC', + 'isac', ], 'include_dirs': [ './main/test', @@ -61,7 +61,7 @@ 'sources': [ './main/test/SwitchingSampRate/SwitchingSampRate.cc', './main/util/utility.c', - ], + ], }, ], diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi index 285583c6b2..a85adbe43e 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi @@ -9,7 +9,7 @@ { 'targets': [ { - 'target_name': 'iSACFix', + 'target_name': 'isac_fix', 'type': 'static_library', 'dependencies': [ '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi index 419d302fd9..b3306a5f8e 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi @@ -10,10 +10,10 @@ 'targets': [ # kenny { - 'target_name': 'iSACFixtest', + 'target_name': 'isac_fix_test', 'type': 'executable', 'dependencies': [ - 'iSACFix', + 'isac_fix', '<(webrtc_root)/test/test.gyp:test_support', ], 'include_dirs': [ diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi index 44b4335407..462d752d55 100644 --- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi +++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi @@ -9,11 +9,11 @@ { 'targets': [ { - 'target_name': 'PCM16B', + 'target_name': 'pcm16b', 'type': 'static_library', 'dependencies': [ 'audio_encoder_interface', - 'G711', + 'g711', ], 'include_dirs': [ 'include', diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi index a6b145f371..9a38faca82 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.gypi @@ -9,13 +9,13 @@ { 'variables': { 'audio_coding_dependencies': [ - 'CNG', - 'G711', - 'G722', - 'iLBC', - 'iSAC', - 'iSACFix', - 'PCM16B', + 'cng', + 'g711', + 'g722', + 'ilbc', + 'isac', + 'isac_fix', + 'pcm16b', 'red', '<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi index e7897d5759..2c58c998d6 100644 --- a/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -9,13 +9,13 @@ { 'variables': { 'codecs': [ - 'G711', - 'G722', - 'PCM16B', - 'iLBC', - 'iSAC', - 'iSACFix', - 'CNG', + 'cng', + 'g711', + 'g722', + 'ilbc', + 'isac', + 'isac_fix', + 'pcm16b', ], 'neteq_defines': [], 'conditions': [ diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi index 1cf4053c7c..4b04092162 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi @@ -12,11 +12,11 @@ 'target_name': 'neteq_rtpplay', 'type': 'executable', 'dependencies': [ + '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + '<(webrtc_root)/test/test.gyp:test_support_main', 'neteq', 'neteq_unittest_tools', - 'PCM16B', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + 'pcm16b', ], 'sources': [ 'tools/neteq_rtpplay.cc', @@ -30,14 +30,14 @@ 'type': 'executable', 'dependencies': [ # 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', + 'cng', + 'g711', + 'g722', + 'ilbc', + 'isac', + 'neteq_test_tools', # Test helpers + 'pcm16b', ], 'defines': [ 'CODEC_ILBC', @@ -84,10 +84,10 @@ 'target_name': 'rtp_analyze', 'type': 'executable', 'dependencies': [ - 'neteq_unittest_tools', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', + 'neteq_unittest_tools', ], 'sources': [ 'tools/rtp_analyze.cc', @@ -98,8 +98,8 @@ 'target_name': 'RTPchange', 'type': 'executable', 'dependencies': [ - 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', + 'neteq_test_tools', ], 'sources': [ 'test/RTPchange.cc', @@ -110,8 +110,8 @@ 'target_name': 'RTPtimeshift', 'type': 'executable', 'dependencies': [ - 'neteq_test_tools', '<(DEPTH)/testing/gtest.gyp:gtest', + 'neteq_test_tools', ], 'sources': [ 'test/RTPtimeshift.cc', @@ -134,8 +134,8 @@ 'target_name': 'rtp_to_text', 'type': 'executable', 'dependencies': [ - 'neteq_test_tools', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + 'neteq_test_tools', ], 'sources': [ 'test/rtp_to_text.cc', @@ -158,11 +158,11 @@ 'target_name': 'neteq_test_support', 'type': 'static_library', 'dependencies': [ - 'neteq', - 'PCM16B', - 'neteq_unittest_tools', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + 'neteq', + 'neteq_unittest_tools', + 'pcm16b', ], 'sources': [ 'tools/neteq_external_decoder_test.cc', @@ -178,10 +178,10 @@ 'target_name': 'neteq_speed_test', 'type': 'executable', 'dependencies': [ - 'neteq', - 'neteq_test_support', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', + 'neteq', + 'neteq_test_support', ], 'sources': [ 'test/neteq_speed_test.cc', @@ -192,12 +192,12 @@ 'target_name': 'neteq_opus_quality_test', 'type': 'executable', 'dependencies': [ - 'neteq', - 'neteq_test_support', - 'webrtc_opus', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', + 'neteq', + 'neteq_test_support', + 'webrtc_opus', ], 'sources': [ 'test/neteq_opus_quality_test.cc', @@ -208,12 +208,12 @@ 'target_name': 'neteq_isac_quality_test', 'type': 'executable', 'dependencies': [ - 'neteq', - 'neteq_test_support', - 'iSACFix', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', + 'isac_fix', + 'neteq', + 'neteq_test_support', ], 'sources': [ 'test/neteq_isac_quality_test.cc', @@ -224,12 +224,12 @@ 'target_name': 'neteq_pcmu_quality_test', 'type': 'executable', 'dependencies': [ - 'neteq', - 'neteq_test_support', - 'G711', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', + 'g711', + 'neteq', + 'neteq_test_support', ], 'sources': [ 'test/neteq_pcmu_quality_test.cc', @@ -240,12 +240,12 @@ 'target_name': 'neteq_ilbc_quality_test', 'type': 'executable', 'dependencies': [ - 'neteq', - 'neteq_test_support', - 'iLBC', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/test/test.gyp:test_support_main', + 'neteq', + 'neteq_test_support', + 'ilbc', ], 'sources': [ 'test/neteq_ilbc_quality_test.cc', @@ -261,14 +261,14 @@ 'neteq_dummy_rtp%': 0, }, 'dependencies': [ - 'G711', - 'G722', - 'PCM16B', - 'iLBC', - 'iSAC', - 'CNG', - '<(webrtc_root)/common.gyp:webrtc_common', '<(DEPTH)/testing/gtest.gyp:gtest', + '<(webrtc_root)/common.gyp:webrtc_common', + 'cng', + 'g711', + 'g722', + 'ilbc', + 'isac', + 'pcm16b', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index 2e994d804f..8eb277503f 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -28,7 +28,7 @@ '<(webrtc_root)/base/base.gyp:rtc_base_approved', '<(webrtc_root)/common.gyp:webrtc_common', '<(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', ], 'sources': [ diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index db249b2d09..cd1882badb 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -62,15 +62,15 @@ 'audioproc_test_utils', 'bitrate_controller', 'bwe_simulator', - 'CNG', + 'cng', 'desktop_capture', - 'iSACFix', + 'isac_fix', 'media_file', 'neteq', 'neteq_test_support', 'neteq_unittest_tools', 'paced_sender', - 'PCM16B', # Needed by NetEq tests. + 'pcm16b', # Needed by NetEq tests. 'red', 'remote_bitrate_estimator', 'rtp_rtcp',