Move //mojo/{public, edk} underneath //third_party

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': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/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': [
-            'mojo_public.gyp:mojo_bindings_java',
-            'mojo_public.gyp:mojo_public_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
     },
     {
       'target_name': 'mojo_none',
       'type': 'none',
     },
     {
       # GN version: //mojo/common
@@ skipping 29 matching lines @@
       # GN version: //mojo/common:mojo_common_unittests
       'target_name': 'mojo_common_unittests',
       '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',
         'mojo_common_lib',
-        'mojo_edk.gyp:mojo_system_impl',
-        'mojo_edk.gyp:mojo_common_test_support',
-        'mojo_edk.gyp:mojo_run_all_unittests',
+        '../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',
         'mojo_environment_chromium',
-        'mojo_public.gyp:mojo_cpp_bindings',
-        'mojo_public.gyp:mojo_public_test_utils',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
         'common/handle_watcher_unittest.cc',
         'common/message_pump_mojo_unittest.cc',
       ],
     },
     {
       # GN version: //mojo/environment:chromium
       'target_name': 'mojo_environment_chromium',
       'type': 'static_library',
       'dependencies': [
         'mojo_environment_chromium_impl',
       ],
       'sources': [
         'environment/environment.cc',
         # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
-        "public/cpp/environment/logging.h",
-        "public/cpp/environment/lib/logging.cc",
+        "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
+        "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
       ],
       '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_common_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',
       ],
       'include_dirs': [
         '..',
+        '../third_party/mojo/src',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/mojo/src',
+        ],
+      },
     },
     {
      # GN version: //mojo/application
      'target_name': 'mojo_application_chromium',
      'type': 'static_library',
      'sources': [
        'application/application_runner_chromium.cc',
        'application/application_runner_chromium.h',
       ],
       'dependencies': [
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'mojo_public.gyp:mojo_application_base',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_base',
        ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_application_base',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_base',
        ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'mojo_jni_headers',
           'type': 'none',
           'dependencies': [
             'mojo_java_set_jni_headers',
           ],
           'sources': [
             'android/javatests/src/org/chromium/mojo/MojoTestCase.java',
             'android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java',
             'android/system/src/org/chromium/mojo/system/impl/CoreImpl.java',
           ],
           'variables': {
             'jni_gen_package': 'mojo',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libmojo_system_java',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'mojo_common_lib',
-            'mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             'mojo_environment_chromium',
             'mojo_jni_headers',
           ],
           'sources': [
             'android/system/core_impl.cc',
             'android/system/core_impl.h',
           ],
         },
         {
           'target_name': 'mojo_java_set_jni_headers',
           'type': 'none',
           'variables': {
             'jni_gen_package': 'mojo',
             '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',
-            'mojo_public.gyp:mojo_public_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',
           },
           'includes': [ '../build/java.gypi' ],
         },
       ]
     }]
   ]
 }