Rename Mojo targets to have a mojo_ prefix.

To avoid polluting the global target namespace, we should make sure all
the Mojo targets have a mojo_ prefix.

BUG=324635
TEST=mojob.sh test
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/110713003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239995 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 14 deletions

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 6b75395..b5ea669 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -17,16 +17,17 @@
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
-        'hello_world_service',
         'mojo_bindings',
         'mojo_bindings_unittests',
         'mojo_common_lib',
         'mojo_common_unittests',
+        'mojo_hello_world_service',
         'mojo_js',
         'mojo_js_unittests',
         'mojo_public_perftests',
         'mojo_public_test_support',
         'mojo_public_unittests',
+        'mojo_sample_app',
         'mojo_shell',
         'mojo_shell_lib',
         'mojo_system',
@@ -34,7 +35,6 @@
         'mojo_system_unittests',
         'mojo_utility',
         'mojo_utility_unittests',
-        'sample_app',
       ],
     },
     {
@@ -296,7 +296,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
-          'target_name': 'java_set_jni_headers',
+          'target_name': 'mojo_java_set_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'mojo',
@@ -308,7 +308,7 @@
           'target_name': 'mojo_jni_headers',
           'type': 'none',
           'dependencies': [
-            'java_set_jni_headers',
+            'mojo_java_set_jni_headers',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi
index dddf66f..6e5ec4a 100644
--- a/mojo/mojo_apps.gypi
+++ b/mojo/mojo_apps.gypi
@@ -43,7 +43,7 @@
         '../gin/gin.gyp:gin_test',
         'mojo_js_lib',
         'mojo_run_all_unittests',
-        'sample_service',
+        'mojo_sample_service',
       ],
       'sources': [
         'apps/js/test/run_js_tests.cc',
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index 8796824..f904ec6 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -1,7 +1,7 @@
 {
   'targets': [
     {
-      'target_name': 'sample_app',
+      'target_name': 'mojo_sample_app',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -24,14 +24,14 @@
       ],
     },
     {
-      'target_name': 'package_sample_app',
+      'target_name': 'package_mojo_sample_app',
       'variables': {
-        'app_name': 'sample_app',
+        'app_name': 'mojo_sample_app',
       },
       'includes': [ 'build/package_app.gypi' ],
     },
     {
-      'target_name': 'hello_world_bindings',
+      'target_name': 'mojo_hello_world_bindings',
       'type': 'static_library',
       'sources': [
         'examples/hello_world_service/hello_world_service.mojom',
@@ -43,14 +43,14 @@
       ],
     },
     {
-      'target_name': 'hello_world_service',
+      'target_name': 'mojo_hello_world_service',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        'hello_world_bindings',
+        'mojo_hello_world_bindings',
       ],
       'export_dependent_settings': [
-        'hello_world_bindings',
+        'mojo_hello_world_bindings',
       ],
       'sources': [
         'examples/hello_world_service/hello_world_service_impl.cc',
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 51c19dd..2a106f6 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -107,7 +107,7 @@
       ],
     },
     {
-      'target_name': 'sample_service',
+      'target_name': 'mojo_sample_service',
       'type': 'static_library',
       'sources': [
         'public/bindings/sample/sample_service.mojom',
@@ -128,7 +128,7 @@
         '../testing/gtest.gyp:gtest',
         'mojo_public_test_support',
         'mojo_run_all_unittests',
-        'sample_service',
+        'mojo_sample_service',
       ],
     },
     {