Move third_party/mojo/src/mojo/public to mojo/public

mojo/mojo_base.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
+    'mojo_variables.gypi',
   ],
   'targets': [
     {
       'target_name': 'mojo_base',
       'type': 'none',
       'dependencies': [
         # NOTE: If adding a new dependency here, please consider whether it
         # should also be added to the list of Mojo-related dependencies of
         # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
         # target on iOS due to the presence of the js targets, which cause v8
         # to be built.
         'mojo_common_lib',
         'mojo_common_unittests',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
-            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
-            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
+            '../mojo/mojo_public.gyp:mojo_bindings_java',
+            '../mojo/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
     },
     {
       'target_name': 'mojo_none',
       'type': 'none',
     },
     {
       # GN version: //mojo/message_pump
@@ skipping 86 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
         '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_public_test_utils',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_message_pump_lib',
         'mojo_url_type_converters',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
         'message_pump/handle_watcher_unittest.cc',
         'message_pump/message_pump_mojo_unittest.cc',
       ],
     },
     {
       # GN version: //mojo/environment:chromium
       'target_name': 'mojo_environment_chromium',
       'type': 'static_library',
       'dependencies': [
         'mojo_environment_chromium_impl',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
-        "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
-        "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",
         'environment/environment.cc',
+        "public/cpp/environment/async_waiter.h",
+        "public/cpp/environment/lib/async_waiter.cc",
+        "public/cpp/environment/lib/logging.cc",
+        "public/cpp/environment/lib/scoped_task_tracking.cc",
+        "public/cpp/environment/lib/scoped_task_tracking.cc",
+        "public/cpp/environment/logging.h",
+        "public/cpp/environment/task_tracker.h",
       ],
       'include_dirs': [
         '..',
-        '../third_party/mojo/src',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/mojo/src',
-        ],
-      },
       'export_dependent_settings': [
         'mojo_environment_chromium_impl',
       ],
     },
     {
       # GN version: //mojo/environment:chromium_impl
       'target_name': 'mojo_environment_chromium_impl',
       'type': '<(component)',
       'defines': [
         'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_message_pump_lib',
         '<(mojo_system_for_component)',
       ],
       'sources': [
         'environment/default_async_waiter_impl.cc',
         'environment/default_async_waiter_impl.h',
         'environment/default_logger_impl.cc',
         'environment/default_logger_impl.h',
         'environment/default_run_loop_impl.cc',
         'environment/default_run_loop_impl.h',
         'environment/default_task_tracker_impl.cc',
         'environment/default_task_tracker_impl.h',
       ],
       'include_dirs': [
         '..',
-        '../third_party/mojo/src',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/mojo/src',
-        ],
-      },
     },
     {
       'target_name': 'mojo_application_bindings_mojom',
       'type': 'none',
       'variables': {
         'mojom_files': [
           'application/public/interfaces/application.mojom',
           'application/public/interfaces/content_handler.mojom',
           'application/public/interfaces/service_provider.mojom',
           'application/public/interfaces/shell.mojom',
         ],
       },
       'dependencies': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
-      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
+      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       # GN version: //mojo/application/public/cpp
       'target_name': 'mojo_application_base',
       'type': 'static_library',
       'sources': [
         'application/public/cpp/app_lifetime_helper.h',
         'application/public/cpp/application_connection.h',
         'application/public/cpp/application_delegate.h',
         'application/public/cpp/application_impl.h',
@@ skipping 13 matching lines @@
         'application/public/cpp/lib/service_registry.h',
         'application/public/cpp/service_connector.h',
         'application/public/cpp/service_provider_impl.h',
       ],
       'dependencies': [
         'mojo_application_bindings',
         'mojo_message_pump_lib',
       ],
     },
     {
-      # GN version: //mojo/public/interfaces/application:application
+      # GN version:public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
       'dependencies': [
         'mojo_application_bindings_mojom',
         'mojo_services.gyp:network_service_bindings_lib',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_lib',
       ],
     },
     {
       # GN version: //mojo/test:test_support
       'target_name': 'mojo_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'sources': [
         'test/test_utils.h',
         'test/test_utils_posix.cc',
         'test/test_utils_win.cc',
       ],
     },
     {
       # GN version: //mojo/application/public/cpp/tests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
         'mojo_application_base',
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
-        '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
+        '../mojo/mojo_public.gyp:mojo_utility',
+        '../mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
         'application/public/cpp/tests/service_registry_unittest.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
@@ skipping 36 matching lines @@
             'input_java_class': 'java/util/HashSet.class',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
         {
           'target_name': 'mojo_system_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             'libmojo_system_java',
-            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
+            '../mojo/mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',
           },
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'mojo_common_unittests_run',
           'type': 'none',
           'dependencies': [
             'mojo_common_unittests',
           ],
           'includes': [
             '../build/isolate.gypi',
           ],
           'sources': [
             'mojo_common_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }