summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 21:41:09 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 21:41:09 +0000
commit6831f8bd7dd40e5ce4830e095d4178d79b84d5b0 (patch)
treef4e5ea46cbcde295ee649e2dab3e51e5ca2731f8
parent47345849a95bc8d21d60c711ed68ce54b8660a86 (diff)
downloadchromium_src-6831f8bd7dd40e5ce4830e095d4178d79b84d5b0.zip
chromium_src-6831f8bd7dd40e5ce4830e095d4178d79b84d5b0.tar.gz
chromium_src-6831f8bd7dd40e5ce4830e095d4178d79b84d5b0.tar.bz2
Change Chromoting->Remoting
Just some target name cleanup BUG=NONE TEST=BUILD Review URL: http://codereview.chromium.org/6993001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85327 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_common.gypi2
-rw-r--r--remoting/remoting.gyp112
2 files changed, 57 insertions, 57 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2ff892a..1ae861b 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -341,7 +341,7 @@
}],
['remoting==1', {
'dependencies': [
- '../remoting/remoting.gyp:chromoting_client_plugin',
+ '../remoting/remoting.gyp:remoting_client_plugin',
],
}],
],
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 944b93b..febde09 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -48,15 +48,15 @@
'conditions': [
['OS=="linux" or OS=="mac"', {
'targets': [
- # Simple webserver for testing chromoting client plugin.
+ # Simple webserver for testing remoting client plugin.
{
- 'target_name': 'chromoting_client_test_webserver',
+ 'target_name': 'remoting_client_test_webserver',
'type': 'executable',
'sources': [
'tools/client_webserver/main.c',
],
}
- ], # end of target 'chromoting_client_test_webserver'
+ ], # end of target 'remoting_client_test_webserver'
}],
# TODO(hclam): Enable this target for mac.
@@ -64,12 +64,12 @@
'targets': [
{
- 'target_name': 'chromoting_x11_client',
+ 'target_name': 'remoting_x11_client',
'type': 'executable',
'dependencies': [
- 'chromoting_base',
- 'chromoting_client',
- 'chromoting_jingle_glue',
+ 'remoting_base',
+ 'remoting_client',
+ 'remoting_jingle_glue',
],
'link_settings': {
'libraries': [
@@ -86,23 +86,23 @@
'client/x11_view.cc',
'client/x11_view.h',
],
- }, # end of target 'chromoting_x11_client'
+ }, # end of target 'remoting_x11_client'
],
}], # end of OS conditions for x11 client
], # end of 'conditions'
'targets': [
{
- 'target_name': 'chromoting_client_plugin',
+ 'target_name': 'remoting_client_plugin',
'type': 'static_library',
'defines': [
'HAVE_STDINT_H', # Required by on2_integer.h
],
'dependencies': [
- 'chromoting_base',
- 'chromoting_client',
- 'chromoting_jingle_glue',
- '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp_objects',
+ 'remoting_base',
+ 'remoting_client',
+ 'remoting_jingle_glue',
+ '../ppapi/ppapi.gyp:ppapi_cpp_objects',
# TODO(sergeyu): This is a hack: plugin should not depend on
# webkit glue. Skia is needed here to add include path webkit glue
@@ -137,16 +137,16 @@
'../media/base/yuv_row_win.cc',
'../media/base/yuv_row_posix.cc',
],
- }, # end of target 'chromoting_client_plugin'
+ }, # end of target 'remoting_client_plugin'
{
- 'target_name': 'chromoting_host_plugin',
+ 'target_name': 'remoting_host_plugin',
'type': 'loadable_module',
'defines': [
'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
],
'dependencies': [
- 'chromoting_base',
- 'chromoting_host',
+ 'remoting_base',
+ 'remoting_host',
'../third_party/npapi/npapi.gyp:npapi',
],
'sources': [
@@ -173,12 +173,12 @@
],
}],
],
- }, # end of target 'chromoting_host_plugin'
+ }, # end of target 'remoting_host_plugin'
{
'target_name': 'webapp_me2mom',
'type': 'none',
'dependencies': [
- 'chromoting_host_plugin',
+ 'remoting_host_plugin',
],
'sources': [
'webapp/build-webapp.py',
@@ -197,7 +197,7 @@
'action_name': 'Build Me2Mom WebApp',
'inputs': [
'webapp/me2mom/',
- '<(PRODUCT_DIR)/<(plugin_prefix)chromoting_host_plugin.<(plugin_extension)',
+ '<(PRODUCT_DIR)/<(plugin_prefix)remoting_host_plugin.<(plugin_extension)',
],
'outputs': [
'<(PRODUCT_DIR)/remoting/remoting-me2mom.webapp',
@@ -212,7 +212,7 @@
],
}, # end of target 'webapp_me2mom'
{
- 'target_name': 'chromoting_base',
+ 'target_name': 'remoting_base',
'type': '<(library)',
'dependencies': [
'../base/base.gyp:base',
@@ -221,7 +221,7 @@
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/libvpx/libvpx.gyp:libvpx_include',
'../third_party/zlib/zlib.gyp:zlib',
- 'chromoting_jingle_glue',
+ 'remoting_jingle_glue',
'proto/chromotocol.gyp:chromotocol_proto_lib',
'proto/trace.gyp:trace_proto_lib',
# TODO(hclam): Enable VP8 in the build.
@@ -282,15 +282,15 @@
],
}],
],
- }, # end of target 'chromoting_base'
+ }, # end of target 'remoting_base'
{
- 'target_name': 'chromoting_host',
+ 'target_name': 'remoting_host',
'type': '<(library)',
'dependencies': [
- 'chromoting_base',
- 'chromoting_jingle_glue',
- 'chromoting_protocol',
+ 'remoting_base',
+ 'remoting_jingle_glue',
+ 'remoting_protocol',
'differ_block',
'../crypto/crypto.gyp:crypto',
],
@@ -373,15 +373,15 @@
},
}],
],
- }, # end of target 'chromoting_host'
+ }, # end of target 'remoting_host'
{
- 'target_name': 'chromoting_client',
+ 'target_name': 'remoting_client',
'type': '<(library)',
'dependencies': [
- 'chromoting_base',
- 'chromoting_jingle_glue',
- 'chromoting_protocol',
+ 'remoting_base',
+ 'remoting_jingle_glue',
+ 'remoting_protocol',
],
'sources': [
'client/chromoting_client.cc',
@@ -402,15 +402,15 @@
'client/rectangle_update_decoder.cc',
'client/rectangle_update_decoder.h',
],
- }, # end of target 'chromoting_client'
+ }, # end of target 'remoting_client'
{
- 'target_name': 'chromoting_simple_host',
+ 'target_name': 'remoting_simple_host',
'type': 'executable',
'dependencies': [
- 'chromoting_base',
- 'chromoting_host',
- 'chromoting_jingle_glue',
+ 'remoting_base',
+ 'remoting_host',
+ 'remoting_jingle_glue',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
],
@@ -421,13 +421,13 @@
'../base/test/mock_chrome_application_mac.mm',
'../base/test/mock_chrome_application_mac.h',
],
- }, # end of target 'chromoting_simple_host'
+ }, # end of target 'remoting_simple_host'
{
- 'target_name': 'chromoting_host_keygen',
+ 'target_name': 'remoting_host_keygen',
'type': 'executable',
'dependencies': [
- 'chromoting_base',
+ 'remoting_base',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../crypto/crypto.gyp:crypto',
@@ -435,10 +435,10 @@
'sources': [
'host/keygen_main.cc',
],
- }, # end of target 'chromoting_host_keygen'
+ }, # end of target 'remoting_host_keygen'
{
- 'target_name': 'chromoting_jingle_glue',
+ 'target_name': 'remoting_jingle_glue',
'type': '<(library)',
'dependencies': [
'../base/base.gyp:base',
@@ -468,19 +468,19 @@
'jingle_glue/xmpp_socket_adapter.cc',
'jingle_glue/xmpp_socket_adapter.h',
],
- }, # end of target 'chromoting_jingle_glue'
+ }, # end of target 'remoting_jingle_glue'
{
- 'target_name': 'chromoting_protocol',
+ 'target_name': 'remoting_protocol',
'type': '<(library)',
'dependencies': [
- 'chromoting_base',
- 'chromoting_jingle_glue',
+ 'remoting_base',
+ 'remoting_jingle_glue',
'../crypto/crypto.gyp:crypto',
'../jingle/jingle.gyp:jingle_glue',
],
'export_dependent_settings': [
- 'chromoting_jingle_glue',
+ 'remoting_jingle_glue',
],
'sources': [
'protocol/auth_token_utils.cc',
@@ -544,7 +544,7 @@
'protocol/video_writer.cc',
'protocol/video_writer.h',
],
- }, # end of target 'chromoting_protocol'
+ }, # end of target 'remoting_protocol'
{
'target_name': 'differ_block',
@@ -590,8 +590,8 @@
'target_name': 'chromotocol_test_client',
'type': 'executable',
'dependencies': [
- 'chromoting_base',
- 'chromoting_protocol',
+ 'remoting_base',
+ 'remoting_protocol',
],
'sources': [
'protocol/protocol_test_client.cc',
@@ -605,11 +605,11 @@
'target_name': 'remoting_unittests',
'type': 'executable',
'dependencies': [
- 'chromoting_base',
- 'chromoting_client',
- 'chromoting_host',
- 'chromoting_jingle_glue',
- 'chromoting_protocol',
+ 'remoting_base',
+ 'remoting_client',
+ 'remoting_host',
+ 'remoting_jingle_glue',
+ 'remoting_protocol',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
@@ -695,7 +695,7 @@
],
}],
], # end of 'conditions'
- }, # end of target 'chromoting_unittests'
+ }, # end of target 'remoting_unittests'
], # end of targets
}