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

This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk

It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.

This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.

NOPRESUBMIT=true

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

Cr-Commit-Position: refs/heads/master@{#312129}

DEPS

@@ -738,8 +738,8 @@ hooks = [
     'name': 'download_mojo_shell',
     'pattern': '',
     'action': [ 'python',
-                'src/mojo/public/tools/download_shell_binary.py',
-                '--tools-directory=../../../tools',
+                'src/third_party/mojo/src/mojo/public/tools/download_shell_binary.py',
+                '--tools-directory=../../../../../../tools',
               ],
   },
   {

android_webview/java_library_common.mk

@@ -22,8 +22,8 @@ LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../device/battery/android/java/src) \
     $(call all-java-files-under, ../media/base/android/java/src) \
     $(call all-java-files-under, ../mojo/android/system/src) \
-    $(call all-java-files-under, ../mojo/public/java/bindings/src) \
-    $(call all-java-files-under, ../mojo/public/java/system/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/bindings/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/system/src) \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
     $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \

build/all.gyp

@@ -51,17 +51,17 @@
             # javascript-related targets cause v8 to be built.
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_common_unittests',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_system_unittests',
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/mojo_public.gyp:mojo_public_test_utils',
-            '../mojo/mojo_public.gyp:mojo_system',
             '../google_apis/google_apis.gyp:google_apis_unittests',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
+            '../third_party/mojo/mojo_public.gyp:mojo_system',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',

build/get_landmines.py

@@ -53,6 +53,7 @@ def print_landmines():
   if (platform() != 'ios'):
     print 'Clobber to get rid of obselete test plugin after r248358'
     print 'Clobber to rebuild GN files for V8'
+  print 'Clobber to get rid of stale generated mojom.h files'
   print 'Need to clobber everything due to build_nexe change in nacl r13424'
   print '[chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_* compil...'
   print 'blink_resources.grd changed: crbug.com/400860'

chrome/browser/BUILD.gn

@@ -242,10 +242,7 @@ static_library("browser") {
       "//content/app/resources",
       "//media",
       "//mojo/common",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/js",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
@@ -255,6 +252,9 @@ static_library("browser") {
       "//third_party/leveldatabase",
       "//third_party/libaddressinput",
       "//third_party/libyuv",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/js",
       "//third_party/npapi",
       "//third_party/re2",
       "//third_party/smhasher:cityhash",

chrome/browser/ui/BUILD.gn

@@ -100,7 +100,6 @@ static_library("ui") {
       "//components/power",
       "//device/nfc",
       "//media",
-      "//mojo/edk/system",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",
@@ -109,6 +108,7 @@ static_library("ui") {
       "//third_party/expat",
       "//third_party/hunspell",
       "//third_party/leveldatabase",
+      "//third_party/mojo/src/mojo/edk/system",
       "//third_party/npapi",
       "//third_party/libjingle",
       "//third_party/re2",

chrome/browser/ui/webui/omnibox/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: chrome/chrome_web_ui_mojo_bindings.gyp:webui_mojo_bindings
 mojom("mojo_bindings") {

chrome/chrome_browser.gypi

@@ -3001,9 +3001,6 @@
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/mojo_public.gyp:mojo_js_bindings',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
@@ -3014,6 +3011,9 @@
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
             '../third_party/libyuv/libyuv.gyp:libyuv',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/smhasher/smhasher.gyp:cityhash',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',

chrome/chrome_browser_ui.gypi

@@ -2725,13 +2725,13 @@
             '../components/components.gyp:translate_content_common',
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/media.gyp:media',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/re2/re2.gyp:re2',
             '../ui/compositor/compositor.gyp:compositor',

chrome/chrome_tests_unit.gypi

@@ -2018,11 +2018,11 @@
         'test_support_common',
         '../base/base.gyp:base',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
       ],
       'include_dirs': [
         '..',

chrome/chrome_web_ui_mojo_bindings.gyp

@@ -13,7 +13,7 @@
       'sources': [
         'browser/ui/webui/omnibox/omnibox.mojom',
       ],
-      'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
     },
   ],
 }

chrome/test/BUILD.gn

@@ -209,8 +209,8 @@ source_set("test_support_unit") {
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 }
 

components/nacl.gyp

@@ -78,11 +78,11 @@
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../ipc/ipc.gyp:ipc',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_nacl.gyp:monacl_syscall',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
           ],
           'conditions': [
             ['disable_nacl_untrusted==0', {
@@ -352,11 +352,11 @@
               },
               'dependencies': [
                 'nacl_common_win64',
-                '../mojo/mojo_edk.gyp:mojo_system_impl_win64',
                 '../mojo/mojo_nacl.gyp:monacl_syscall_win64',
                 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
                 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
+                '../third_party/mojo/mojo_edk.gyp:mojo_system_impl_win64',
               ],
               'export_dependent_settings': [
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',

content/app/BUILD.gn

@@ -57,9 +57,9 @@ if (is_ios) {
   ]
 } else {
   content_app_deps += [
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 

content/browser/BUILD.gn

@@ -101,9 +101,6 @@ source_set("browser") {
       "//content/browser/devtools:resources",
       "//content/common:mojo_bindings",
       "//content/public/common:mojo_bindings",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/interfaces/application",
-      "//mojo/public/js",
       "//net:http_server",
       "//storage/browser",
       "//storage/common",
@@ -112,6 +109,9 @@ source_set("browser") {
       "//third_party/icu",
       "//third_party/leveldatabase",
       "//third_party/libyuv",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
+      "//third_party/mojo/src/mojo/public/js",
       "//ui/resources",
       "//ui/surface",
       "//ui/touch_selection",

content/child/BUILD.gn

@@ -17,7 +17,7 @@ source_set("child") {
                         "//content")
 
   public_deps = [
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   deps = [
@@ -25,9 +25,9 @@ source_set("child") {
     "//components/tracing",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/application",
     "//skia",
     "//third_party/icu",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",

content/common/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/common/common.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 if (is_chromeos && cpu_arch != "arm") {
   action("libva_generate_stubs") {
@@ -138,12 +138,12 @@ source_set("common") {
       "//gpu/skia_bindings",
       "//media",
       "//media:shared_memory_support",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/interfaces/application",
       "//sandbox",
       "//storage/common",
       "//third_party/WebKit/public:blink",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
       "//ui/gl",
       "//webkit/common/gpu",
     ]
@@ -413,6 +413,6 @@ mojom("mojo_bindings") {
 
   deps = [
     "//content/public/common:mojo_bindings",
-    "//mojo/public/interfaces/application:application",
+    "//third_party/mojo/src/mojo/public/interfaces/application:application",
   ]
 }

content/content.gyp

@@ -431,9 +431,9 @@
             '../device/vibration/vibration.gyp:device_vibration_java',
             '../media/media.gyp:media_java',
             '../mojo/mojo_base.gyp:mojo_system_java',
-            '../mojo/mojo_public.gyp:mojo_application_bindings',
-            '../mojo/mojo_public.gyp:mojo_bindings_java',
             '../net/net.gyp:net',
+            '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
             '../ui/android/ui_android.gyp:ui_java',
             '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
             '../third_party/WebKit/public/blink_headers.gyp:blink_headers_java',

content/content_app.gypi

@@ -11,7 +11,7 @@
     '../base/base.gyp:base_i18n',
     '../crypto/crypto.gyp:crypto',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
-    '../mojo/mojo_edk.gyp:mojo_system_impl',
+    '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gfx/gfx.gyp:gfx_geometry',

content/content_browser.gypi

@@ -1676,18 +1676,18 @@
         'browser/devtools/devtools.gyp:devtools_protocol_handler',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../net/net.gyp:http_server',
         '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/angle/src/angle.gyp:commit_id',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
         '../ui/surface/surface.gyp:surface',
         '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
       ],
       'export_dependent_settings': [
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     }],
     ['enable_basic_printing==1 or enable_print_preview==1', {

content/content_common.gypi

@@ -576,17 +576,17 @@
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
       ],
       'export_dependent_settings' : [
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'actions': [
         {

content/content_common_mojo_bindings.gyp

@@ -21,7 +21,7 @@
           'public/common/permission_status.mojom',
         ],
       },
-      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       'target_name': 'content_common_mojo_bindings',
@@ -30,8 +30,8 @@
       'dependencies': [
         'content_common_mojo_bindings_mojom',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ]
     },
   ]

content/content_renderer.gypi

@@ -18,7 +18,6 @@
     '../media/blink/media_blink.gyp:media_blink',
     '../media/media.gyp:media',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
-    '../mojo/mojo_edk.gyp:mojo_js_lib',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../storage/storage_common.gyp:storage_common',
@@ -26,6 +25,7 @@
     '../third_party/icu/icu.gyp:icui18n',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/libjingle/libjingle.gyp:libjingle',
+    '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
     '../third_party/npapi/npapi.gyp:npapi',
     '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
     '../ui/accessibility/accessibility.gyp:accessibility',

content/content_resources.grd

@@ -38,14 +38,14 @@
         <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" />
       </if>
       <if expr="not is_ios">
-        <include name="IDR_MOJO_BINDINGS_JS" file="../mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_BUFFER_JS" file="../mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/router.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_UNICODE_JS" file="../mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_VALIDATOR_JS" file="../mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_BINDINGS_JS" file="../third_party/mojo/src/mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_BUFFER_JS" file="../third_party/mojo/src/mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CODEC_JS" file="../third_party/mojo/src/mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CONNECTION_JS" file="../third_party/mojo/src/mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CONNECTOR_JS" file="../third_party/mojo/src/mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_ROUTER_JS" file="../third_party/mojo/src/mojo/public/js/router.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_UNICODE_JS" file="../third_party/mojo/src/mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_VALIDATOR_JS" file="../third_party/mojo/src/mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" />
       </if>
     </includes>
   </release>

content/content_tests.gypi

@@ -769,12 +769,12 @@
       'type': 'static_library',
       'dependencies': [
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../storage/storage_common.gyp:storage_common',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_base_test_support',
@@ -959,14 +959,14 @@
         '../device/battery/battery.gyp:device_battery',
         '../device/battery/battery.gyp:device_battery_mojo_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../third_party/re2/re2.gyp:re2',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/base/ui_base.gyp:ui_base',
@@ -1280,14 +1280,14 @@
           'target_name': 'web_ui_test_mojo_bindings',
           'type': 'static_library',
           'dependencies': [
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
           'sources': [
             'test/data/web_ui_test_mojo_bindings.mojom',
           ],
-          'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
+          'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
           'export_dependent_settings': [
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
         },
         {
@@ -1315,10 +1315,6 @@
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../mojo/mojo_edk.gyp:mojo_common_test_support',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/mojo_public.gyp:mojo_js_bindings',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
@@ -1330,6 +1326,10 @@
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/mesa/mesa.gyp:osmesa',
+            '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
             '../ui/accessibility/accessibility.gyp:accessibility',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
@@ -1947,10 +1947,10 @@
             '../device/battery/battery.gyp:device_battery_javatests',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
-            '../mojo/mojo_public.gyp:mojo_public_test_interfaces',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../net/net.gyp:net_java_test_support',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',

content/gpu/BUILD.gn

@@ -26,8 +26,8 @@ source_set("gpu") {
     "//base",
     "//content:export",
     "//content/public/child:child_sources",
-    "//mojo/public/interfaces/application",
     "//skia",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/gl",
   ]
 

content/plugin/BUILD.gn

@@ -32,8 +32,8 @@ if (enable_plugins && !is_linux) {
 
     deps = [
       "//content:export",
-      "//mojo/public/interfaces/application",
       "//skia",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
       "//third_party/npapi",
       "//third_party/WebKit/public:blink",
     ]

content/ppapi_plugin/BUILD.gn

@@ -25,11 +25,11 @@ source_set("ppapi_plugin") {
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
-    "//mojo/public/interfaces/application",
     "//ppapi:ppapi_ipc",
     "//skia",
     "//third_party/icu",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",

content/public/android/BUILD.gn

@@ -36,9 +36,9 @@ android_library("content_java") {
     "//device/battery:mojo_bindings_java",
     "//media/base/android:media_java",
     "//mojo/android:system_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
     "//net/android:net_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/WebKit/public:blink_headers_java",
@@ -162,11 +162,11 @@ android_library("content_javatests") {
     "//content/shell/android:content_shell_test_java",
     "//media/base/android:media_java",
     "//mojo/android:system_java",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     ":content_java",
   ]

content/public/browser/BUILD.gn

@@ -49,7 +49,7 @@ source_set("browser_sources") {
     "//content/public/common:mojo_bindings",
     # We expose skia headers in the public API.
     "//skia",
-    "//mojo/public/cpp/system",
+    "//third_party/mojo/src/mojo/public/cpp/system",
   ]
   deps = [
     "//content/browser",

content/public/common/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import("//content/common/common.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # See //content/BUILD.gn for how this works.
 group("common") {
@@ -30,7 +30,7 @@ source_set("common_sources") {
 
   public_deps = [
     "//content/common",
-    "//mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
   deps = [
     "//net",

content/renderer/BUILD.gn

@@ -38,15 +38,15 @@ source_set("renderer") {
     "//jingle:jingle_glue",
     "//media",
     "//media/blink",
-    "//mojo/edk/js",
     "//mojo/environment:chromium",
-    "//mojo/public/js",
-    "//mojo/public/interfaces/application",
     "//net",
     "//skia",
     "//storage/common",
     "//third_party/icu",
     "//third_party/libjingle",
+    "//third_party/mojo/src/mojo/edk/js",
+    "//third_party/mojo/src/mojo/public/js",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//third_party/npapi",
     "//third_party/WebKit/public:blink",
     "//third_party/widevine/cdm:version_h",

content/shell/android/BUILD.gn

@@ -49,8 +49,8 @@ android_library("content_shell_java") {
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
-    "//mojo/public/java:system",
     "//net/android:net_java",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     ":content_shell_java_resources",
   ]

content/test/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 content_tests_gypi_values =
     exec_script("//build/gypi_to_gn.py",
@@ -268,17 +268,17 @@ if (!is_mac) {
       "//media/audio:test_support",
       "//media/base:test_support",
       "//media:shared_memory_support",
-      "//mojo/edk/system",
-      "//mojo/edk/test:test_support",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/js",
       "//net:test_support",
       "//ppapi:ppapi_host",
       "//ppapi:ppapi_ipc",
       "//ppapi:ppapi_proxy",
       "//ppapi:ppapi_shared",
 
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/edk/test:test_support",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/js",
       #"//ppapi:ppapi_tests",  TODO(GYP)
       #"//ppapi:ppapi_unittest_shared",  TODO(GYP)
       "//testing/gmock",
@@ -434,15 +434,15 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
       "//crypto",
       "//device/battery",
       "//device/battery:mojo_bindings",
-      "//mojo/edk/test:test_support",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
       "//net:test_support",
       "//skia",
       "//sql",
       "//sql:test_support",
       "//testing/gmock",
       "//testing/gtest",
+      "//third_party/mojo/src/mojo/edk/test:test_support",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
       "//third_party/re2",
       "//ui/accessibility",
       "//ui/base",

content/utility/BUILD.gn

@@ -23,7 +23,7 @@ source_set("utility") {
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//courgette:courgette_lib",
-    "//mojo/public/interfaces/application",
     "//third_party/WebKit/public:blink_headers",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }

device/battery/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 component("battery") {
   output_name = "device_battery"
@@ -30,8 +30,8 @@ component("battery") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (is_chromeos) {

device/battery/android/BUILD.gn

@@ -15,7 +15,7 @@ android_library("battery_monitor_android") {
   deps = [
     "//base:base_java",
     "//device/battery:mojo_bindings_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }

device/battery/battery.gyp

@@ -12,7 +12,7 @@
       'target_name': 'device_battery_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'battery_monitor.mojom',
@@ -56,8 +56,8 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_battery_mojo_bindings',
       ],
       'defines': [
@@ -122,7 +122,7 @@
           'type': 'none',
           'dependencies': [
             '../../base/base.gyp:base',
-            '../../mojo/mojo_public.gyp:mojo_bindings_java',
+            '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
             'device_battery_mojo_bindings',
           ],
           'variables': {

device/device_tests.gyp

@@ -13,10 +13,10 @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
         'battery/battery.gyp:device_battery',
         'battery/battery.gyp:device_battery_mojo_bindings',

device/serial/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: device/serial/serial.gyp:device_serial
 static_library("serial") {

device/serial/serial.gyp

@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in device_serial
       'type': 'none',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'data_stream.mojom',
@@ -42,12 +42,12 @@
       ],
       'dependencies': [
         'device_serial_mojo',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../net/net.gyp:net',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'device_serial_mojo',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/device/serial/data_stream.mojom.cc',

device/vibration/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 component("vibration") {
   output_name = "device_vibration"
@@ -23,8 +23,8 @@ component("vibration") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (is_android) {

device/vibration/vibration.gyp

@@ -12,7 +12,7 @@
       'target_name': 'device_vibration_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'vibration_manager.mojom',
@@ -26,8 +26,8 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_vibration_mojo_bindings',
       ],
       'defines': [

extensions/BUILD.gn

@@ -272,13 +272,13 @@ if (false) {
       "//extensions/common",
       "//extensions/renderer",
       "//extensions/strings",
-      "//mojo/edk/js",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/leveldatabase",
+      "//third_party/mojo/src/mojo/edk/js",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
 
     if (is_win) {

extensions/common/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: extensions/extensions.gyp:extensions_common_constants
 source_set("common_constants") {

extensions/extensions.gyp

@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in extensions_common
       'type': 'none',
       'includes': [
-        '../mojo/mojom_bindings_generator.gypi',
+        '../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'common/mojo/keep_alive.mojom',
@@ -867,8 +867,8 @@
         'extensions_resources.gyp:extensions_resources',
         '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
-        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
       ],
       'include_dirs': [
         '..',
@@ -1181,12 +1181,12 @@
         '../device/serial/serial.gyp:device_serial',
         '../device/serial/serial.gyp:device_serial_test_util',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_js_lib',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'common/api/api.gyp:cast_channel_proto',
         'extensions_common',
         'extensions_renderer',

extensions/renderer/BUILD.gn

@@ -168,9 +168,9 @@ source_set("renderer") {
     "//content:resources",
     "//extensions:extensions_resources",
     "//gin",
-    "//mojo/edk/js",
     "//skia",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/edk/js",
   ]
 
   if (is_win) {

extensions/shell/BUILD.gn

@@ -46,10 +46,10 @@ source_set("app_shell_lib") {
     "//extensions/utility",
     "//extensions:extensions_resources",
     "//extensions:shell_and_test_pak",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//skia",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/edk/system",
     "//ui/wm",
     "//v8",
   ]

extensions/shell/app_shell.gyp

@@ -41,9 +41,9 @@
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
-        '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+        '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [

ipc/mojo/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 mojom("client_channel") {
   sources = [
@@ -32,8 +32,8 @@ component("mojo") {
     "//base/third_party/dynamic_annotations",
     "//ipc",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
     ":client_channel",
   ]
 }
@@ -53,8 +53,8 @@ test("ipc_mojo_unittests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
     "//url",
   ]
 }
@@ -72,8 +72,8 @@ test("ipc_mojo_perftests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
     "//url",
   ]
 }

ipc/mojo/ipc_mojo.gyp

@@ -17,14 +17,14 @@
       'defines': [
         'IPC_MOJO_IMPLEMENTATION',
       ],
-      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
+      'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         '../ipc.gyp:ipc',
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         'client_channel.mojom',
@@ -57,9 +57,9 @@
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'ipc_mojo',
       ],
       'include_dirs': [
@@ -85,9 +85,9 @@
         '../../base/base.gyp:test_support_base',
         '../../base/base.gyp:test_support_perf',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'ipc_mojo',
       ],
       'include_dirs': [

media/mojo/interfaces/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [

media/mojo/services/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 # Target naming conventions:
 # - converters: C++/Mojo type converters.
@@ -24,9 +24,9 @@ source_set("converters") {
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/geometry/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }
 
@@ -36,11 +36,11 @@ source_set("cdm_proxy") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/public/interfaces/application",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
-    "//mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/cpp/application",
   ]
 
   sources = [
@@ -56,10 +56,10 @@ source_set("cdm_service") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/public/interfaces/application",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 
   sources = [
@@ -89,9 +89,9 @@ source_set("renderer_proxy") {
     "//media/mojo/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
-    "//mojo/public/cpp/application",
-    "//mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 
@@ -143,10 +143,10 @@ test("media_mojo_unittests") {
     "//base/test:test_support",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/edk/system",
-    "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
   ]
 }
 
@@ -159,7 +159,7 @@ if (!is_component_build) {
     deps = [
       ":renderer_service",
       "//mojo/application",
-      "//mojo/public/c/system:for_shared_library",
+      "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
     ]
   }
 

mojo/BUILD.gn

@@ -10,8 +10,8 @@ group("mojo") {
   deps = [
     ":tests",
     "//mojo/common",
-    "//mojo/public",
     "//mojo/services",
+    "//third_party/mojo/src/mojo/public",
   ]
 
   if (is_android) {
@@ -24,14 +24,14 @@ group("tests") {
   deps = [
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
-    "//mojo/edk/js/test:js_unittests",
-    "//mojo/edk/system:mojo_message_pipe_perftests",
-    "//mojo/edk/system:mojo_system_unittests",
-    "//mojo/edk/test:mojo_public_application_unittests",
-    "//mojo/edk/test:mojo_public_bindings_unittests",
-    "//mojo/edk/test:mojo_public_environment_unittests",
-    "//mojo/edk/test:mojo_public_system_perftests",
-    "//mojo/edk/test:mojo_public_system_unittests",
-    "//mojo/edk/test:mojo_public_utility_unittests",
+    "//third_party/mojo/src/mojo/edk/js/test:js_unittests",
+    "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests",
+    "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_application_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
   ]
 }

mojo/android/BUILD.gn

@@ -42,9 +42,9 @@ source_set("libsystem_java") {
   deps = [
     ":system_java_jni_headers",
     "//base",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
 }
 
@@ -61,7 +61,7 @@ android_library("system_java") {
 
   deps = [
     "//base:base_java",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
 
@@ -93,9 +93,9 @@ android_library("mojo_javatests") {
     ":system_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
 
@@ -117,10 +117,10 @@ shared_library("mojo_java_unittests") {
     "//base",
     "//base/test/:test_support",
     "//mojo/common",
-    "//mojo/edk/system",
-    "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
-    "//mojo/public/cpp/test_support:test_utils",
-    "//mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
+    "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
   defines = [ "UNIT_TEST" ]
 }
@@ -132,8 +132,8 @@ android_apk("mojo_test_apk") {
     ":mojo_java_unittests",
     ":system_java",
     "//base:base_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
   native_libs = [ "libmojo_java_unittests.so" ]
   apk_name = "MojoTest"

mojo/application/BUILD.gn

@@ -10,7 +10,7 @@ source_set("application") {
   ]
 
   public_deps = [
-    "//mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/cpp/application",
   ]
   deps = [
     "//base",
@@ -26,7 +26,7 @@ source_set("test_support") {
   ]
 
   public_deps = [
-    "//mojo/public/cpp/application:test_support",
+    "//third_party/mojo/src/mojo/public/cpp/application:test_support",
   ]
   deps = [
     "//base",

mojo/cc/BUILD.gn

@@ -12,11 +12,11 @@ source_set("cc") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//mojo/converters/surfaces",
-    "//mojo/public/c/gles2",
-    "//mojo/public/cpp/environment",
-    "//mojo/public/cpp/system",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/gles2",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/public/cpp/system",
   ]
 
   sources = [

mojo/common/BUILD.gn

@@ -25,7 +25,7 @@ component("common") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
     "//url",
   ]
 }
@@ -36,12 +36,12 @@ test("mojo_common_unittests") {
     ":common",
     "//base",
     "//base:message_loop_tests",
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/edk/test:test_support",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/public/cpp/test_support:test_utils",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
+    "//third_party/mojo/src/mojo/edk/test:test_support",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
     "//url",
   ]
 

mojo/converters/geometry/BUILD.gn

@@ -13,8 +13,8 @@ component("geometry") {
     "//skia",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/geometry/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 
   defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]

mojo/converters/input_events/BUILD.gn

@@ -19,8 +19,8 @@ component("input_events") {
     "//ui/gfx/geometry",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/input_events/public/interfaces",
     "//mojo/services/geometry/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }

mojo/converters/surfaces/BUILD.gn

@@ -28,9 +28,9 @@ component("surfaces") {
     "//gpu",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }

mojo/converters/surfaces/tests/BUILD.gn

@@ -12,12 +12,12 @@ test("mojo_surfaces_lib_unittests") {
     "//gpu",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
-    "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//mojo/services/geometry/public/interfaces",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx:test_support",

mojo/environment/BUILD.gn

@@ -10,8 +10,8 @@ source_set("chromium") {
     "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",
   ]
 
   public_deps = [
@@ -35,6 +35,8 @@ component("chromium_impl") {
 
   defines = [ "MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION" ]
 
+  public_configs = [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ]
+
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",

mojo/mojo.gyp

@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -13,10 +13,10 @@
       'type': 'none',
       'dependencies': [
         'mojo_base.gyp:mojo_base',
-        'mojo_edk_tests.gyp:mojo_edk_tests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_edk_tests',
         'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'mojo_input_events_converters.gyp:mojo_input_events_lib',
-        'mojo_public.gyp:mojo_public',
+        '../third_party/mojo/mojo_public.gyp:mojo_public',
         'mojo_services_public.gyp:mojo_services_public',
       ],
     },

mojo/mojo_base.gyp

@@ -7,7 +7,7 @@
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -25,8 +25,8 @@
       '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',
           ],
         }],
       ]
@@ -76,12 +76,12 @@
         '../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',
@@ -99,12 +99,18 @@
       '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',
       ],
@@ -132,7 +138,13 @@
       ],
       'include_dirs': [
         '..',
+        '../third_party/mojo/src',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/mojo/src',
+        ],
+      },
     },
     {
      # GN version: //mojo/application
@@ -145,10 +157,10 @@
       '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',
        ],
     },
   ],
@@ -178,7 +190,7 @@
             '../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',
           ],
@@ -202,7 +214,7 @@
           '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',

mojo/mojo_edk_system_impl.gypi

@@ -1,133 +0,0 @@
-# Copyright (c) 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.
-
-# The dictionary here is defined for use by the "mojo_system_impl" and
-# "mojo_system_impl_win64" targets in mojo/mojo_edk.gyp. It's defined in this
-# .gypi file so the sections aren't duplicated.
-{
-  'defines': [
-    'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
-    'MOJO_SYSTEM_IMPLEMENTATION',
-    'MOJO_USE_SYSTEM_IMPL',
-  ],
-  'sources': [
-    'edk/embedder/configuration.h',
-    'edk/embedder/channel_info_forward.h',
-    'edk/embedder/channel_init.cc',
-    'edk/embedder/channel_init.h',
-    'edk/embedder/embedder.cc',
-    'edk/embedder/embedder.h',
-    'edk/embedder/embedder_internal.h',
-    'edk/embedder/entrypoints.cc',
-    'edk/embedder/platform_channel_pair.cc',
-    'edk/embedder/platform_channel_pair.h',
-    'edk/embedder/platform_channel_pair_posix.cc',
-    'edk/embedder/platform_channel_pair_win.cc',
-    'edk/embedder/platform_channel_utils_posix.cc',
-    'edk/embedder/platform_channel_utils_posix.h',
-    'edk/embedder/platform_handle.cc',
-    'edk/embedder/platform_handle.h',
-    'edk/embedder/platform_handle_utils.h',
-    'edk/embedder/platform_handle_utils_posix.cc',
-    'edk/embedder/platform_handle_utils_win.cc',
-    'edk/embedder/platform_handle_vector.h',
-    'edk/embedder/platform_shared_buffer.h',
-    'edk/embedder/platform_support.h',
-    'edk/embedder/scoped_platform_handle.h',
-    'edk/embedder/simple_platform_shared_buffer.cc',
-    'edk/embedder/simple_platform_shared_buffer.h',
-    'edk/embedder/simple_platform_shared_buffer_android.cc',
-    'edk/embedder/simple_platform_shared_buffer_posix.cc',
-    'edk/embedder/simple_platform_shared_buffer_win.cc',
-    'edk/embedder/simple_platform_support.cc',
-    'edk/embedder/simple_platform_support.h',
-    'edk/system/awakable.h',
-    'edk/system/awakable_list.cc',
-    'edk/system/awakable_list.h',
-    'edk/system/async_waiter.cc',
-    'edk/system/async_waiter.h',
-    'edk/system/channel.cc',
-    'edk/system/channel.h',
-    'edk/system/channel_endpoint.cc',
-    'edk/system/channel_endpoint.h',
-    'edk/system/channel_endpoint_client.h',
-    'edk/system/channel_endpoint_id.cc',
-    'edk/system/channel_endpoint_id.h',
-    'edk/system/channel_info.cc',
-    'edk/system/channel_info.h',
-    'edk/system/channel_manager.cc',
-    'edk/system/channel_manager.h',
-    'edk/system/configuration.cc',
-    'edk/system/configuration.h',
-    'edk/system/core.cc',
-    'edk/system/core.h',
-    'edk/system/data_pipe.cc',
-    'edk/system/data_pipe.h',
-    'edk/system/data_pipe_consumer_dispatcher.cc',
-    'edk/system/data_pipe_consumer_dispatcher.h',
-    'edk/system/data_pipe_producer_dispatcher.cc',
-    'edk/system/data_pipe_producer_dispatcher.h',
-    'edk/system/dispatcher.cc',
-    'edk/system/dispatcher.h',
-    'edk/system/endpoint_relayer.cc',
-    'edk/system/endpoint_relayer.h',
-    'edk/system/handle_signals_state.h',
-    'edk/system/handle_table.cc',
-    'edk/system/handle_table.h',
-    'edk/system/incoming_endpoint.cc',
-    'edk/system/incoming_endpoint.h',
-    'edk/system/local_data_pipe.cc',
-    'edk/system/local_data_pipe.h',
-    'edk/system/local_message_pipe_endpoint.cc',
-    'edk/system/local_message_pipe_endpoint.h',
-    'edk/system/mapping_table.cc',
-    'edk/system/mapping_table.h',
-    'edk/system/memory.cc',
-    'edk/system/memory.h',
-    'edk/system/message_in_transit.cc',
-    'edk/system/message_in_transit.h',
-    'edk/system/message_in_transit_queue.cc',
-    'edk/system/message_in_transit_queue.h',
-    'edk/system/message_pipe.cc',
-    'edk/system/message_pipe.h',
-    'edk/system/message_pipe_dispatcher.cc',
-    'edk/system/message_pipe_dispatcher.h',
-    'edk/system/message_pipe_endpoint.cc',
-    'edk/system/message_pipe_endpoint.h',
-    'edk/system/options_validation.h',
-    'edk/system/platform_handle_dispatcher.cc',
-    'edk/system/platform_handle_dispatcher.h',
-    'edk/system/proxy_message_pipe_endpoint.cc',
-    'edk/system/proxy_message_pipe_endpoint.h',
-    'edk/system/raw_channel.cc',
-    'edk/system/raw_channel.h',
-    'edk/system/raw_channel_posix.cc',
-    'edk/system/raw_channel_win.cc',
-    'edk/system/shared_buffer_dispatcher.cc',
-    'edk/system/shared_buffer_dispatcher.h',
-    'edk/system/simple_dispatcher.cc',
-    'edk/system/simple_dispatcher.h',
-    'edk/system/transport_data.cc',
-    'edk/system/transport_data.h',
-    'edk/system/waiter.cc',
-    'edk/system/waiter.h',
-    # Test-only code:
-    # TODO(vtl): It's a little unfortunate that these end up in the same
-    # component as non-test-only code. In the static build, this code
-    # should hopefully be dead-stripped.
-    'edk/embedder/test_embedder.cc',
-    'edk/embedder/test_embedder.h',
-  ],
-  'all_dependent_settings': {
-    # Ensures that dependent projects import the core functions on Windows.
-    'defines': ['MOJO_USE_SYSTEM_IMPL'],
-  },
-  'conditions': [
-    ['OS=="android"', {
-      'dependencies': [
-        '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
-      ],
-    }],
-  ],
-}

mojo/mojo_geometry_converters.gyp

@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {

mojo/mojo_input_events_converters.gyp

@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {

mojo/mojo_nacl.gyp

@@ -50,7 +50,7 @@
             '<(monacl_codegen_dir)/mojo_syscall.cc',
           ],
           'dependencies': [
-            'mojo_public.gyp:mojo_system_placeholder',
+            '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
           ],
         },
         {
@@ -76,7 +76,7 @@
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             'monacl_sel',
           ],
           'sources': [
@@ -100,7 +100,7 @@
                 '<(monacl_codegen_dir)/mojo_syscall.cc',
               ],
               'dependencies': [
-                'mojo_public.gyp:mojo_system_placeholder',
+                '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
               ],
               'configurations': {
                 'Common_Base': {

mojo/mojo_nacl_untrusted.gyp

@@ -9,9 +9,9 @@
         'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl',
       },
       'includes': [
-        'mojo_variables.gypi',
         '../build/common_untrusted.gypi',
         '../components/nacl/nacl_defines.gypi',
+        '../third_party/mojo/mojo_variables.gypi',
       ],
       'targets': [
         {
@@ -31,7 +31,7 @@
           ],
           'dependencies': [
             'mojo_nacl.gyp:monacl_codegen',
-            'mojo_public.gyp:mojo_system_placeholder',
+            '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
           ],
         },
         {

mojo/mojo_public.gyp

@@ -1,389 +0,0 @@
-# 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.
-
-{
-  'includes': [
-    'mojo_variables.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'mojo_public',
-      'type': 'none',
-      'dependencies': [
-        'mojo_js_bindings',
-        'mojo_public_test_interfaces',
-        'mojo_public_test_utils',
-        'mojo_system',
-        'mojo_utility',
-      ],
-    },
-    {
-      # Targets that (a) need to obtain the settings that mojo_system passes on
-      # to its direct dependents but (b) are not themselves in a position to
-      # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g.,
-      # because they are components) should depend on this target.
-      'target_name': 'mojo_system_placeholder',
-      'type': 'none',
-    },
-    {
-      # GN version: //mojo/public/c/system
-      'target_name': 'mojo_system',
-      'type': 'static_library',
-      'defines': [
-        'MOJO_SYSTEM_IMPLEMENTATION',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },
-      'all_dependent_settings': {
-        'conditions': [
-          # We need to be able to call the MojoSetSystemThunks() function in
-          # system_thunks.cc
-          ['OS=="android"', {
-            'ldflags!': [
-              '-Wl,--exclude-libs=ALL',
-            ],
-          }],
-        ],
-      },
-      'sources': [
-        'public/c/system/buffer.h',
-        'public/c/system/core.h',
-        'public/c/system/data_pipe.h',
-        'public/c/system/functions.h',
-        'public/c/system/macros.h',
-        'public/c/system/message_pipe.h',
-        'public/c/system/system_export.h',
-        'public/c/system/types.h',
-        'public/platform/native/system_thunks.cc',
-        'public/platform/native/system_thunks.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/bindings
-      'target_name': 'mojo_cpp_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'public/cpp/bindings/array.h',
-        'public/cpp/bindings/binding.h',
-        'public/cpp/bindings/callback.h',
-        'public/cpp/bindings/error_handler.h',
-        'public/cpp/bindings/interface_impl.h',
-        'public/cpp/bindings/interface_ptr.h',
-        'public/cpp/bindings/interface_request.h',
-        'public/cpp/bindings/message.h',
-        'public/cpp/bindings/message_filter.h',
-        'public/cpp/bindings/no_interface.h',
-        'public/cpp/bindings/string.h',
-        'public/cpp/bindings/strong_binding.h',
-        'public/cpp/bindings/type_converter.h',
-        'public/cpp/bindings/lib/array_internal.h',
-        'public/cpp/bindings/lib/array_internal.cc',
-        'public/cpp/bindings/lib/array_serialization.h',
-        'public/cpp/bindings/lib/bindings_internal.h',
-        'public/cpp/bindings/lib/bindings_serialization.cc',
-        'public/cpp/bindings/lib/bindings_serialization.h',
-        'public/cpp/bindings/lib/bounds_checker.cc',
-        'public/cpp/bindings/lib/bounds_checker.h',
-        'public/cpp/bindings/lib/buffer.h',
-        'public/cpp/bindings/lib/callback_internal.h',
-        'public/cpp/bindings/lib/connector.cc',
-        'public/cpp/bindings/lib/connector.h',
-        'public/cpp/bindings/lib/filter_chain.cc',
-        'public/cpp/bindings/lib/filter_chain.h',
-        'public/cpp/bindings/lib/fixed_buffer.cc',
-        'public/cpp/bindings/lib/fixed_buffer.h',
-        'public/cpp/bindings/lib/interface_ptr_internal.h',
-        'public/cpp/bindings/lib/map_data_internal.h',
-        'public/cpp/bindings/lib/map_internal.h',
-        'public/cpp/bindings/lib/map_serialization.h',
-        'public/cpp/bindings/lib/message.cc',
-        'public/cpp/bindings/lib/message_builder.cc',
-        'public/cpp/bindings/lib/message_builder.h',
-        'public/cpp/bindings/lib/message_filter.cc',
-        'public/cpp/bindings/lib/message_header_validator.cc',
-        'public/cpp/bindings/lib/message_header_validator.h',
-        'public/cpp/bindings/lib/message_internal.h',
-        'public/cpp/bindings/lib/message_queue.cc',
-        'public/cpp/bindings/lib/message_queue.h',
-        'public/cpp/bindings/lib/no_interface.cc',
-        'public/cpp/bindings/lib/router.cc',
-        'public/cpp/bindings/lib/router.h',
-        'public/cpp/bindings/lib/shared_data.h',
-        'public/cpp/bindings/lib/shared_ptr.h',
-        'public/cpp/bindings/lib/string_serialization.h',
-        'public/cpp/bindings/lib/string_serialization.cc',
-        'public/cpp/bindings/lib/validate_params.h',
-        'public/cpp/bindings/lib/validation_errors.cc',
-        'public/cpp/bindings/lib/validation_errors.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/js
-      'target_name': 'mojo_js_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'public/js/constants.cc',
-        'public/js/constants.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/environment:standalone
-      'target_name': 'mojo_environment_standalone',
-      'type': 'static_library',
-      'sources': [
-        'public/c/environment/async_waiter.h',
-        'public/c/environment/logger.h',
-        'public/cpp/environment/async_waiter.h',
-        'public/cpp/environment/environment.h',
-        'public/cpp/environment/lib/async_waiter.cc',
-        'public/cpp/environment/lib/default_async_waiter.cc',
-        'public/cpp/environment/lib/default_async_waiter.h',
-        'public/cpp/environment/lib/default_logger.cc',
-        'public/cpp/environment/lib/default_logger.h',
-        'public/cpp/environment/lib/environment.cc',
-        'public/cpp/environment/lib/logging.cc',
-        'public/cpp/environment/logging.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/utility
-      'target_name': 'mojo_utility',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/utility/mutex.h',
-        'public/cpp/utility/run_loop.h',
-        'public/cpp/utility/run_loop_handler.h',
-        'public/cpp/utility/thread.h',
-        'public/cpp/utility/lib/mutex.cc',
-        'public/cpp/utility/lib/run_loop.cc',
-        'public/cpp/utility/lib/thread.cc',
-        'public/cpp/utility/lib/thread_local.h',
-        'public/cpp/utility/lib/thread_local_posix.cc',
-        'public/cpp/utility/lib/thread_local_win.cc',
-      ],
-      'conditions': [
-        # See crbug.com/342893:
-        ['OS=="win"', {
-          'sources!': [
-            'public/cpp/utility/mutex.h',
-            'public/cpp/utility/thread.h',
-            'public/cpp/utility/lib/mutex.cc',
-            'public/cpp/utility/lib/thread.cc',
-          ],
-        }],
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      'target_name': 'mojo_application_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'public/interfaces/application/application.mojom',
-          'public/interfaces/application/service_provider.mojom',
-          'public/interfaces/application/shell.mojom',
-        ],
-      },
-      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      # GN version: //mojo/public/interfaces/application:application
-      'target_name': 'mojo_application_bindings',
-      'type': 'static_library',
-      'dependencies': [
-        'mojo_application_bindings_mojom',
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/application
-      'target_name': 'mojo_application_base',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/application/application_connection.h',
-        'public/cpp/application/application_delegate.h',
-        'public/cpp/application/application_impl.h',
-        'public/cpp/application/connect.h',
-        'public/cpp/application/interface_factory.h',
-        'public/cpp/application/interface_factory_impl.h',
-        'public/cpp/application/lib/application_connection.cc',
-        'public/cpp/application/lib/application_delegate.cc',
-        'public/cpp/application/lib/application_impl.cc',
-        'public/cpp/application/lib/service_provider_impl.cc',
-        'public/cpp/application/lib/service_connector.cc',
-        'public/cpp/application/lib/service_connector.h',
-        'public/cpp/application/lib/service_registry.cc',
-        'public/cpp/application/lib/service_registry.h',
-        'public/cpp/application/lib/weak_service_provider.cc',
-        'public/cpp/application/lib/weak_service_provider.h',
-        'public/cpp/application/service_provider_impl.h',
-      ],
-      'dependencies': [
-        'mojo_application_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_application_bindings',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/application:standalone"
-      'target_name': 'mojo_application_standalone',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/application/lib/application_runner.cc',
-        'public/cpp/application/application_runner.h',
-      ],
-      'dependencies': [
-        'mojo_application_base',
-        'mojo_environment_standalone',
-      ],
-      'export_dependent_settings': [
-        'mojo_application_base',
-      ],
-    },
-    {
-      # GN version: //mojo/public/c/test_support
-      'target_name': 'mojo_test_support',
-      'defines': [
-        'MOJO_TEST_SUPPORT_IMPLEMENTATION',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },
-      'sources': [
-        'public/c/test_support/test_support.h',
-        'public/c/test_support/test_support_export.h',
-        # TODO(vtl): Convert this to thunks http://crbug.com/386799
-        'public/tests/test_support_private.cc',
-        'public/tests/test_support_private.h',
-      ],
-      'conditions': [
-        ['OS=="ios"', {
-          'type': 'static_library',
-        }, {
-          'type': 'shared_library',
-        }],
-        ['OS=="mac"', {
-          'xcode_settings': {
-            # Make it a run-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-          },
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/test_support:test_utils
-      'target_name': 'mojo_public_test_utils',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
-        'mojo_test_support',
-      ],
-      'sources': [
-        'public/cpp/test_support/lib/test_support.cc',
-        'public/cpp/test_support/lib/test_utils.cc',
-        'public/cpp/test_support/test_utils.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils
-      'target_name': 'mojo_public_bindings_test_utils',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'public/cpp/bindings/tests/validation_test_input_parser.cc',
-        'public/cpp/bindings/tests/validation_test_input_parser.h',
-      ],
-    },
-    {
-      'target_name': 'mojo_public_test_interfaces_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'public/interfaces/bindings/tests/math_calculator.mojom',
-          'public/interfaces/bindings/tests/no_module.mojom',
-          'public/interfaces/bindings/tests/rect.mojom',
-          'public/interfaces/bindings/tests/regression_tests.mojom',
-          'public/interfaces/bindings/tests/regression_tests_import.mojom',
-          'public/interfaces/bindings/tests/sample_factory.mojom',
-          'public/interfaces/bindings/tests/sample_import.mojom',
-          'public/interfaces/bindings/tests/sample_import2.mojom',
-          'public/interfaces/bindings/tests/sample_interfaces.mojom',
-          'public/interfaces/bindings/tests/sample_service.mojom',
-          'public/interfaces/bindings/tests/serialization_test_structs.mojom',
-          'public/interfaces/bindings/tests/test_structs.mojom',
-          'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
-        ],
-      },
-      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
-      'target_name': 'mojo_public_test_interfaces',
-      'type': 'static_library',
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_public_test_interfaces_mojom',
-        'mojo_cpp_bindings',
-      ],
-    },
-  ],
-  'conditions': [
-    ['OS == "android"', {
-      'targets': [
-        {
-          # GN version: //mojo/public/java_system
-          'target_name': 'mojo_public_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'public/java/system',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
-        # GN version: //mojo/public/java_bindings
-          'target_name': 'mojo_bindings_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'public/java/bindings',
-           },
-           'dependencies': [
-             'mojo_public_java',
-           ],
-           'includes': [ '../build/java.gypi' ],
-        },
-      ],
-    }],
-  ],
-}

mojo/mojo_public_gles2_for_loadable_module.gypi

@@ -43,16 +43,16 @@
         ],
       },
       'sources': [
-        '<(DEPTH)/mojo/public/c/gles2/gles2.h',
-        '<(DEPTH)/mojo/public/c/gles2/gles2_export.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h',
       ],
     }]
   ]

mojo/mojo_services_public.gyp

@@ -4,8 +4,11 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
+  'variables': {
+    'mojo_sdk_root': '<(DEPTH)/third_party/mojo/src',
+  },
   'targets': [
     {
       'target_name': 'mojo_services_public',
@@ -31,17 +34,17 @@
       'target_name': 'mojo_clipboard_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/clipboard/public/interfaces/clipboard.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -49,21 +52,21 @@
       'target_name': 'mojo_input_events_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/input_events/public/interfaces/input_event_constants.mojom',
         'services/input_events/public/interfaces/input_events.mojom',
         'services/input_events/public/interfaces/input_key_codes.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -71,17 +74,17 @@
       'target_name': 'mojo_geometry_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/geometry/public/interfaces/geometry.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -89,7 +92,7 @@
       'target_name': 'mojo_gpu_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/gpu/public/interfaces/command_buffer.mojom',
@@ -97,14 +100,14 @@
         'services/gpu/public/interfaces/gpu_capabilities.mojom',
         'services/gpu/public/interfaces/viewport_parameter_listener.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -112,24 +115,24 @@
       'target_name': 'mojo_native_viewport_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/native_viewport/public/interfaces/native_viewport.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -138,18 +141,18 @@
       'target_name': 'mojo_navigation_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/navigation/public/interfaces/navigation.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -157,19 +160,19 @@
       'target_name': 'mojo_content_handler_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/content_handler/public/interfaces/content_handler.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -177,7 +180,7 @@
       'target_name': 'mojo_network_bindings',
       'type': 'static_library',
        'variables' : {
-         'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+         'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
        },
        'sources': [
         'services/network/public/interfaces/cookie_store.mojom',
@@ -191,12 +194,12 @@
         'services/network/public/interfaces/url_loader.mojom',
         'services/network/public/interfaces/web_socket.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -212,27 +215,27 @@
       'target_name': 'mojo_view_manager_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/view_manager/public/interfaces/view_manager.mojom',
         'services/view_manager/public/interfaces/view_manager_constants.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
         'mojo_native_viewport_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
         'mojo_native_viewport_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -241,23 +244,23 @@
       'target_name': 'mojo_surfaces_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/surfaces/public/interfaces/surfaces.mojom',
         'services/surfaces/public/interfaces/surfaces_service.mojom',
         'services/surfaces/public/interfaces/quads.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -266,17 +269,17 @@
       'target_name': 'mojo_surface_id_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/surfaces/public/interfaces/surface_id.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -284,21 +287,21 @@
       'target_name': 'mojo_window_manager_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/window_manager/public/interfaces/window_manager.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
   ],

mojo/mojom_bindings_generator_variables.gypi

@@ -1,66 +0,0 @@
-# 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.
-
-{
-  'variables': {
-    'mojom_bindings_generator':
-        '<(DEPTH)/mojo/public/tools/bindings/mojom_bindings_generator.py',
-    'mojom_bindings_generator_sources': [
-      '<(mojom_bindings_generator)',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_cpp_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_java_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_js_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_python_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/error.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/data.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/module.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/pack.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/ast.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/parser.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/translate.py',
-    ]
-  }
-}

mojo/nacl/BUILD.gn

@@ -52,7 +52,7 @@ if (!is_nacl) {
     ]
     deps = [
       "//base:base",
-      "//mojo/edk/system:system",
+      "//third_party/mojo/src/mojo/edk/system:system",
       ":monacl_sel",
     ]
   }
@@ -74,15 +74,15 @@ if (is_nacl) {
   executable("monacl_test") {
     testonly = true
     sources = [
-      "//mojo/public/cpp/system/tests/core_unittest.cc",
-      "//mojo/public/cpp/system/tests/macros_unittest.cc",
+      "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc",
+      "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc",
     ]
     deps = [
       "//native_client/src/untrusted/nacl:imc_syscalls",
-      "//mojo/public/c/system/tests:tests",
-      "//mojo/public/cpp/system:system",
       "//testing/gtest:gtest",
       "//testing/gtest:gtest_main",
+      "//third_party/mojo/src/mojo/public/c/system/tests:tests",
+      "//third_party/mojo/src/mojo/public/cpp/system:system",
       ":mojo",
     ]
   }

mojo/public/VERSION

@@ -1 +0,0 @@
-b737c0531e299ad494725c518699843e76ff84f5

mojo/services/html_viewer/BUILD.gn

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo.gni")
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 action("generate_blink_resource_map") {
   script = "//mojo/services/html_viewer/generate_blink_resource_map.py"
@@ -81,9 +81,6 @@ source_set("lib") {
     "//mojo/cc",
     "//mojo/common",
     "//mojo/converters/surfaces",
-    "//mojo/public/c/system:for_shared_library",
-    "//mojo/public/cpp/utility",
-    "//mojo/public/interfaces/application",
     "//mojo/services/network/public/cpp",
     "//mojo/services/accessibility/public/interfaces",
     "//mojo/services/clipboard/public/interfaces",
@@ -95,14 +92,17 @@ source_set("lib") {
     "//mojo/services/surfaces/public/interfaces",
     "//net",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
+    "//third_party/mojo/src/mojo/public/cpp/utility",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/native_theme",
     "//url",
   ]
 
   public_deps = [
-    "//mojo/public/cpp/bindings",
     "//mojo/services/view_manager/public/cpp",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
     ":generate_blink_resource_map",
   ]
 }

mojo/services/mojo_sdk_root.gni

@@ -3,4 +3,4 @@
 # found in the LICENSE file.
 
 # This variable should point to the parent directory of the Mojo SDK.
-mojo_sdk_root = "//"
+mojo_sdk_root = "//third_party/mojo/src"

mojo/services/network/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 mojo_native_application("network") {
   output_name = "network_service"
@@ -11,9 +11,9 @@ mojo_native_application("network") {
     ":lib",
     "//base",
     "//mojo/application",
-    "//mojo/public/c/system:for_shared_library",
-    "//mojo/public/cpp/bindings:bindings",
     "//mojo/services/network/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
+    "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
   ]
 
   sources = [

ppapi/ppapi_tests_mojo.gyp

@@ -41,8 +41,8 @@
       'dependencies': [
         '../mojo/mojo_nacl_untrusted.gyp:libmojo',
         '../mojo/mojo_nacl.gyp:monacl_codegen',
-        '../mojo/mojo_public.gyp:mojo_system_placeholder',
         '../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+        '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
         'native_client/native_client.gyp:ppapi_lib',
         'ppapi_nacl.gyp:ppapi_cpp_lib',
       ],

third_party/mojo/LICENSE

@@ -0,0 +1,27 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/mojo/README.chromium

@@ -0,0 +1,15 @@
+Name: Mojo
+Short Name: mojo
+URL: https://github.com/domokit/mojo
+Version: Unknown
+Security Critical: Yes
+License: Chromium
+License Android Compatible: yes
+
+Description:
+Mojo is an effort to extract a common platform out of Chrome's renderer and
+plugin processes that can support multiple types of sandboxed content, such as
+HTML, Pepper, or NaCl.
+
+Local Modifications:
+None.

third_party/mojo/mojo_edk.gyp

@@ -6,14 +6,24 @@
   'includes': [
     'mojo_variables.gypi',
   ],
+  'target_defaults' : {
+    'include_dirs': [
+      'src',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+        'src',
+      ],
+    },
+  },
   'targets': [
     {
       # GN version: //mojo/edk/system
       'target_name': 'mojo_system_impl',
       'type': '<(component)',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../base/base.gyp:base',
+        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'includes': [
         'mojo_edk_system_impl.gypi',
@@ -24,31 +34,31 @@
       'target_name': 'mojo_js_lib',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
-        '../v8/tools/gyp/v8.gyp:v8',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin',
+        '../../v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin',
       ],
       'sources': [
         # Sources list duplicated in GN build.
-        'edk/js/core.cc',
-        'edk/js/core.h',
-        'edk/js/drain_data.cc',
-        'edk/js/drain_data.h',
-        'edk/js/handle.cc',
-        'edk/js/handle.h',
-        'edk/js/handle_close_observer.h',
-        'edk/js/mojo_runner_delegate.cc',
-        'edk/js/mojo_runner_delegate.h',
-        'edk/js/support.cc',
-        'edk/js/support.h',
-        'edk/js/threading.cc',
-        'edk/js/threading.h',
-        'edk/js/waiting_callback.cc',
-        'edk/js/waiting_callback.h',
+        'src/mojo/edk/js/core.cc',
+        'src/mojo/edk/js/core.h',
+        'src/mojo/edk/js/drain_data.cc',
+        'src/mojo/edk/js/drain_data.h',
+        'src/mojo/edk/js/handle.cc',
+        'src/mojo/edk/js/handle.h',
+        'src/mojo/edk/js/handle_close_observer.h',
+        'src/mojo/edk/js/mojo_runner_delegate.cc',
+        'src/mojo/edk/js/mojo_runner_delegate.h',
+        'src/mojo/edk/js/support.cc',
+        'src/mojo/edk/js/support.h',
+        'src/mojo/edk/js/threading.cc',
+        'src/mojo/edk/js/threading.h',
+        'src/mojo/edk/js/waiting_callback.cc',
+        'src/mojo/edk/js/waiting_callback.h',
       ],
     },
     {
@@ -56,11 +66,11 @@
       'target_name': 'mojo_test_support_impl',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
+        '../../base/base.gyp:base',
       ],
       'sources': [
-        'edk/test/test_support_impl.cc',
-        'edk/test/test_support_impl.h',
+        'src/mojo/edk/test/test_support_impl.cc',
+        'src/mojo/edk/test/test_support_impl.h',
       ],
     },
     {
@@ -68,22 +78,22 @@
       'target_name': 'mojo_common_test_support',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_system_impl',
       ],
       'sources': [
-        'edk/test/multiprocess_test_helper.cc',
-        'edk/test/multiprocess_test_helper.h',
-        'edk/test/test_utils.h',
-        'edk/test/test_utils_posix.cc',
-        'edk/test/test_utils_win.cc',
+        'src/mojo/edk/test/multiprocess_test_helper.cc',
+        'src/mojo/edk/test/multiprocess_test_helper.h',
+        'src/mojo/edk/test/test_utils.h',
+        'src/mojo/edk/test/test_utils_posix.cc',
+        'src/mojo/edk/test/test_utils_win.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/test/multiprocess_test_helper.cc',
+            'src/mojo/edk/test/multiprocess_test_helper.cc',
           ],
         }],
       ],
@@ -93,15 +103,15 @@
       'target_name': 'mojo_run_all_unittests',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_system_impl',
         'mojo_public.gyp:mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
-        'edk/test/run_all_unittests.cc',
+        'src/mojo/edk/test/run_all_unittests.cc',
       ],
     },
     {
@@ -109,13 +119,13 @@
       'target_name': 'mojo_run_all_perftests',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:test_support_base',
+        '../../base/base.gyp:test_support_base',
         'mojo_edk.gyp:mojo_system_impl',
         'mojo_public.gyp:mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
-        'edk/test/run_all_perftests.cc',
+        'src/mojo/edk/test/run_all_perftests.cc',
       ],
     },
   ],
@@ -126,8 +136,8 @@
           'target_name': 'mojo_system_impl_win64',
           'type': '<(component)',
           'dependencies': [
-            '../base/base.gyp:base_win64',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+            '../../base/base.gyp:base_win64',
+            '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
           ],
           'includes': [
             'mojo_edk_system_impl.gypi',

third_party/mojo/mojo_edk_system_impl.gypi

@@ -0,0 +1,133 @@
+# Copyright (c) 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.
+
+# The dictionary here is defined for use by the "mojo_system_impl" and
+# "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's defined in this
+# .gypi file so the sections aren't duplicated.
+{
+  'defines': [
+    'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
+    'MOJO_SYSTEM_IMPLEMENTATION',
+    'MOJO_USE_SYSTEM_IMPL',
+  ],
+  'sources': [
+    'src/mojo/edk/embedder/configuration.h',
+    'src/mojo/edk/embedder/channel_info_forward.h',
+    'src/mojo/edk/embedder/channel_init.cc',
+    'src/mojo/edk/embedder/channel_init.h',
+    'src/mojo/edk/embedder/embedder.cc',
+    'src/mojo/edk/embedder/embedder.h',
+    'src/mojo/edk/embedder/embedder_internal.h',
+    'src/mojo/edk/embedder/entrypoints.cc',
+    'src/mojo/edk/embedder/platform_channel_pair.cc',
+    'src/mojo/edk/embedder/platform_channel_pair.h',
+    'src/mojo/edk/embedder/platform_channel_pair_posix.cc',
+    'src/mojo/edk/embedder/platform_channel_pair_win.cc',
+    'src/mojo/edk/embedder/platform_channel_utils_posix.cc',
+    'src/mojo/edk/embedder/platform_channel_utils_posix.h',
+    'src/mojo/edk/embedder/platform_handle.cc',
+    'src/mojo/edk/embedder/platform_handle.h',
+    'src/mojo/edk/embedder/platform_handle_utils.h',
+    'src/mojo/edk/embedder/platform_handle_utils_posix.cc',
+    'src/mojo/edk/embedder/platform_handle_utils_win.cc',
+    'src/mojo/edk/embedder/platform_handle_vector.h',
+    'src/mojo/edk/embedder/platform_shared_buffer.h',
+    'src/mojo/edk/embedder/platform_support.h',
+    'src/mojo/edk/embedder/scoped_platform_handle.h',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer.h',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_win.cc',
+    'src/mojo/edk/embedder/simple_platform_support.cc',
+    'src/mojo/edk/embedder/simple_platform_support.h',
+    'src/mojo/edk/system/awakable.h',
+    'src/mojo/edk/system/awakable_list.cc',
+    'src/mojo/edk/system/awakable_list.h',
+    'src/mojo/edk/system/async_waiter.cc',
+    'src/mojo/edk/system/async_waiter.h',
+    'src/mojo/edk/system/channel.cc',
+    'src/mojo/edk/system/channel.h',
+    'src/mojo/edk/system/channel_endpoint.cc',
+    'src/mojo/edk/system/channel_endpoint.h',
+    'src/mojo/edk/system/channel_endpoint_client.h',
+    'src/mojo/edk/system/channel_endpoint_id.cc',
+    'src/mojo/edk/system/channel_endpoint_id.h',
+    'src/mojo/edk/system/channel_info.cc',
+    'src/mojo/edk/system/channel_info.h',
+    'src/mojo/edk/system/channel_manager.cc',
+    'src/mojo/edk/system/channel_manager.h',
+    'src/mojo/edk/system/configuration.cc',
+    'src/mojo/edk/system/configuration.h',
+    'src/mojo/edk/system/core.cc',
+    'src/mojo/edk/system/core.h',
+    'src/mojo/edk/system/data_pipe.cc',
+    'src/mojo/edk/system/data_pipe.h',
+    'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
+    'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
+    'src/mojo/edk/system/data_pipe_producer_dispatcher.cc',
+    'src/mojo/edk/system/data_pipe_producer_dispatcher.h',
+    'src/mojo/edk/system/dispatcher.cc',
+    'src/mojo/edk/system/dispatcher.h',
+    'src/mojo/edk/system/endpoint_relayer.cc',
+    'src/mojo/edk/system/endpoint_relayer.h',
+    'src/mojo/edk/system/handle_signals_state.h',
+    'src/mojo/edk/system/handle_table.cc',
+    'src/mojo/edk/system/handle_table.h',
+    'src/mojo/edk/system/incoming_endpoint.cc',
+    'src/mojo/edk/system/incoming_endpoint.h',
+    'src/mojo/edk/system/local_data_pipe.cc',
+    'src/mojo/edk/system/local_data_pipe.h',
+    'src/mojo/edk/system/local_message_pipe_endpoint.cc',
+    'src/mojo/edk/system/local_message_pipe_endpoint.h',
+    'src/mojo/edk/system/mapping_table.cc',
+    'src/mojo/edk/system/mapping_table.h',
+    'src/mojo/edk/system/memory.cc',
+    'src/mojo/edk/system/memory.h',
+    'src/mojo/edk/system/message_in_transit.cc',
+    'src/mojo/edk/system/message_in_transit.h',
+    'src/mojo/edk/system/message_in_transit_queue.cc',
+    'src/mojo/edk/system/message_in_transit_queue.h',
+    'src/mojo/edk/system/message_pipe.cc',
+    'src/mojo/edk/system/message_pipe.h',
+    'src/mojo/edk/system/message_pipe_dispatcher.cc',
+    'src/mojo/edk/system/message_pipe_dispatcher.h',
+    'src/mojo/edk/system/message_pipe_endpoint.cc',
+    'src/mojo/edk/system/message_pipe_endpoint.h',
+    'src/mojo/edk/system/options_validation.h',
+    'src/mojo/edk/system/platform_handle_dispatcher.cc',
+    'src/mojo/edk/system/platform_handle_dispatcher.h',
+    'src/mojo/edk/system/proxy_message_pipe_endpoint.cc',
+    'src/mojo/edk/system/proxy_message_pipe_endpoint.h',
+    'src/mojo/edk/system/raw_channel.cc',
+    'src/mojo/edk/system/raw_channel.h',
+    'src/mojo/edk/system/raw_channel_posix.cc',
+    'src/mojo/edk/system/raw_channel_win.cc',
+    'src/mojo/edk/system/shared_buffer_dispatcher.cc',
+    'src/mojo/edk/system/shared_buffer_dispatcher.h',
+    'src/mojo/edk/system/simple_dispatcher.cc',
+    'src/mojo/edk/system/simple_dispatcher.h',
+    'src/mojo/edk/system/transport_data.cc',
+    'src/mojo/edk/system/transport_data.h',
+    'src/mojo/edk/system/waiter.cc',
+    'src/mojo/edk/system/waiter.h',
+    # Test-only code:
+    # TODO(vtl): It's a little unfortunate that these end up in the same
+    # component as non-test-only code. In the static build, this code
+    # should hopefully be dead-stripped.
+    'src/mojo/edk/embedder/test_embedder.cc',
+    'src/mojo/edk/embedder/test_embedder.h',
+  ],
+  'all_dependent_settings': {
+    # Ensures that dependent projects import the core functions on Windows.
+    'defines': ['MOJO_USE_SYSTEM_IMPL'],
+  },
+  'conditions': [
+    ['OS=="android"', {
+      'dependencies': [
+        '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
+      ],
+    }],
+  ],
+}

third_party/mojo/mojo_edk_tests.gyp

@@ -34,7 +34,7 @@
       'target_name': 'mojo_public_bindings_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_public.gyp:mojo_environment_standalone',
@@ -44,23 +44,23 @@
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'public/cpp/bindings/tests/array_unittest.cc',
-        'public/cpp/bindings/tests/bounds_checker_unittest.cc',
-        'public/cpp/bindings/tests/buffer_unittest.cc',
-        'public/cpp/bindings/tests/connector_unittest.cc',
-        'public/cpp/bindings/tests/container_test_util.cc',
-        'public/cpp/bindings/tests/equals_unittest.cc',
-        'public/cpp/bindings/tests/handle_passing_unittest.cc',
-        'public/cpp/bindings/tests/interface_ptr_unittest.cc',
-        'public/cpp/bindings/tests/map_unittest.cc',
-        'public/cpp/bindings/tests/request_response_unittest.cc',
-        'public/cpp/bindings/tests/router_unittest.cc',
-        'public/cpp/bindings/tests/sample_service_unittest.cc',
-        'public/cpp/bindings/tests/serialization_warning_unittest.cc',
-        'public/cpp/bindings/tests/string_unittest.cc',
-        'public/cpp/bindings/tests/struct_unittest.cc',
-        'public/cpp/bindings/tests/type_conversion_unittest.cc',
-        'public/cpp/bindings/tests/validation_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/array_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/buffer_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/connector_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/container_test_util.cc',
+        'src/mojo/public/cpp/bindings/tests/equals_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/map_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/request_response_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/router_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/string_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/struct_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/validation_unittest.cc',
       ],
     },
     {
@@ -68,18 +68,18 @@
       'target_name': 'mojo_public_environment_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_environment_standalone',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
-        'public/cpp/environment/tests/async_wait_unittest.cc',
-        'public/cpp/environment/tests/async_waiter_unittest.cc',
-        'public/cpp/environment/tests/logger_unittest.cc',
-        'public/cpp/environment/tests/logging_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/async_wait_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/logger_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/logging_unittest.cc',
       ],
     },
     {
@@ -87,15 +87,15 @@
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_application_standalone',
         'mojo_public.gyp:mojo_utility',
         'mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
-        'public/cpp/application/tests/service_registry_unittest.cc',
+        'src/mojo/public/cpp/application/tests/service_registry_unittest.cc',
       ],
     },
     {
@@ -104,11 +104,11 @@
       'target_name': 'mojo_public_system_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_public_test_utils',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
         '<@(mojo_public_system_unittest_sources)',
       ],
@@ -118,23 +118,23 @@
       'target_name': 'mojo_public_utility_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
-        'public/cpp/utility/tests/mutex_unittest.cc',
-        'public/cpp/utility/tests/run_loop_unittest.cc',
-        'public/cpp/utility/tests/thread_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/run_loop_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
-            'public/cpp/utility/tests/mutex_unittest.cc',
-            'public/cpp/utility/tests/thread_unittest.cc',
+            'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+            'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
           ],
         }],
       ],
@@ -144,14 +144,14 @@
       'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_perftests',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'public/c/system/tests/core_perftest.cc',
+        'src/mojo/public/c/system/tests/core_perftest.cc',
       ],
     },
     {
@@ -159,51 +159,51 @@
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
-        'edk/embedder/embedder_unittest.cc',
-        'edk/embedder/platform_channel_pair_posix_unittest.cc',
-        'edk/embedder/simple_platform_shared_buffer_unittest.cc',
-        'edk/system/awakable_list_unittest.cc',
-        'edk/system/channel_endpoint_id_unittest.cc',
-        'edk/system/channel_manager_unittest.cc',
-        'edk/system/channel_unittest.cc',
-        'edk/system/core_unittest.cc',
-        'edk/system/core_test_base.cc',
-        'edk/system/core_test_base.h',
-        'edk/system/data_pipe_unittest.cc',
-        'edk/system/dispatcher_unittest.cc',
-        'edk/system/local_data_pipe_unittest.cc',
-        'edk/system/memory_unittest.cc',
-        'edk/system/message_pipe_dispatcher_unittest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/message_pipe_unittest.cc',
-        'edk/system/multiprocess_message_pipe_unittest.cc',
-        'edk/system/options_validation_unittest.cc',
-        'edk/system/platform_handle_dispatcher_unittest.cc',
-        'edk/system/raw_channel_unittest.cc',
-        'edk/system/remote_message_pipe_unittest.cc',
-        'edk/system/run_all_unittests.cc',
-        'edk/system/shared_buffer_dispatcher_unittest.cc',
-        'edk/system/simple_dispatcher_unittest.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
-        'edk/system/waiter_test_utils.cc',
-        'edk/system/waiter_test_utils.h',
-        'edk/system/waiter_unittest.cc',
-        'edk/test/multiprocess_test_helper_unittest.cc',
+        'src/mojo/edk/embedder/embedder_unittest.cc',
+        'src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc',
+        'src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc',
+        'src/mojo/edk/system/awakable_list_unittest.cc',
+        'src/mojo/edk/system/channel_endpoint_id_unittest.cc',
+        'src/mojo/edk/system/channel_manager_unittest.cc',
+        'src/mojo/edk/system/channel_unittest.cc',
+        'src/mojo/edk/system/core_unittest.cc',
+        'src/mojo/edk/system/core_test_base.cc',
+        'src/mojo/edk/system/core_test_base.h',
+        'src/mojo/edk/system/data_pipe_unittest.cc',
+        'src/mojo/edk/system/dispatcher_unittest.cc',
+        'src/mojo/edk/system/local_data_pipe_unittest.cc',
+        'src/mojo/edk/system/memory_unittest.cc',
+        'src/mojo/edk/system/message_pipe_dispatcher_unittest.cc',
+        'src/mojo/edk/system/message_pipe_test_utils.h',
+        'src/mojo/edk/system/message_pipe_test_utils.cc',
+        'src/mojo/edk/system/message_pipe_unittest.cc',
+        'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+        'src/mojo/edk/system/options_validation_unittest.cc',
+        'src/mojo/edk/system/platform_handle_dispatcher_unittest.cc',
+        'src/mojo/edk/system/raw_channel_unittest.cc',
+        'src/mojo/edk/system/remote_message_pipe_unittest.cc',
+        'src/mojo/edk/system/run_all_unittests.cc',
+        'src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc',
+        'src/mojo/edk/system/simple_dispatcher_unittest.cc',
+        'src/mojo/edk/system/test_utils.cc',
+        'src/mojo/edk/system/test_utils.h',
+        'src/mojo/edk/system/waiter_test_utils.cc',
+        'src/mojo/edk/system/waiter_test_utils.h',
+        'src/mojo/edk/system/waiter_unittest.cc',
+        'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/embedder/embedder_unittest.cc',
-            'edk/system/multiprocess_message_pipe_unittest.cc',
-            'edk/test/multiprocess_test_helper_unittest.cc',
+            'src/mojo/edk/embedder/embedder_unittest.cc',
+            'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+            'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
           ],
         }],
       ],
@@ -213,19 +213,19 @@
       'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../base/base.gyp:test_support_perf',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../base/base.gyp:test_support_perf',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
-        'edk/system/message_pipe_perftest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
+        'src/mojo/edk/system/message_pipe_perftest.cc',
+        'src/mojo/edk/system/message_pipe_test_utils.h',
+        'src/mojo/edk/system/message_pipe_test_utils.cc',
+        'src/mojo/edk/system/test_utils.cc',
+        'src/mojo/edk/system/test_utils.h',
       ],
     },
     {
@@ -233,7 +233,7 @@
       'target_name': 'mojo_js_unittests',
       'type': 'executable',
       'dependencies': [
-        '../gin/gin.gyp:gin_test',
+        '../../gin/gin.gyp:gin_test',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_edk.gyp:mojo_js_lib',
@@ -242,8 +242,8 @@
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'edk/js/handle_unittest.cc',
-        'edk/js/test/run_js_tests.cc',
+        'src/mojo/edk/js/handle_unittest.cc',
+        'src/mojo/edk/js/test/run_js_tests.cc',
       ],
     },
     {
@@ -251,8 +251,8 @@
       'target_name': 'mojo_js_integration_tests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin_test',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin_test',
         'mojo_public.gyp:mojo_environment_standalone',
         'mojo_public.gyp:mojo_public_test_interfaces',
         'mojo_public.gyp:mojo_utility',
@@ -261,8 +261,8 @@
         'mojo_js_to_cpp_bindings',
       ],
       'sources': [
-        'edk/js/test/run_js_integration_tests.cc',
-        'edk/js/tests/js_to_cpp_tests',
+        'src/mojo/edk/js/test/run_js_integration_tests.cc',
+        'src/mojo/edk/js/tests/js_to_cpp_tests',
       ],
     },
     {
@@ -270,7 +270,7 @@
       'type': 'none',
       'variables': {
         'mojom_files': [
-          'edk/js/tests/js_to_cpp.mojom',
+          'src/mojo/edk/js/tests/js_to_cpp.mojom',
         ],
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],

third_party/mojo/mojo_public.gyp

@@ -0,0 +1,391 @@
+# 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.
+
+{
+  'includes': [
+    'mojo_variables.gypi',
+  ],
+  'target_defaults' : {
+    'include_dirs': [
+      'src',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+        'src',
+      ],
+    },
+  },
+  'targets': [
+    {
+      'target_name': 'mojo_public',
+      'type': 'none',
+      'dependencies': [
+        'mojo_js_bindings',
+        'mojo_public_test_interfaces',
+        'mojo_public_test_utils',
+        'mojo_system',
+        'mojo_utility',
+      ],
+    },
+    {
+      # Targets that (a) need to obtain the settings that mojo_system passes on
+      # to its direct dependents but (b) are not themselves in a position to
+      # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g.,
+      # because they are components) should depend on this target.
+      'target_name': 'mojo_system_placeholder',
+      'type': 'none',
+    },
+    {
+      # GN version: //mojo/public/c/system
+      'target_name': 'mojo_system',
+      'type': 'static_library',
+      'defines': [
+        'MOJO_SYSTEM_IMPLEMENTATION',
+      ],
+      'all_dependent_settings': {
+        'conditions': [
+          # We need to be able to call the MojoSetSystemThunks() function in
+          # system_thunks.cc
+          ['OS=="android"', {
+            'ldflags!': [
+              '-Wl,--exclude-libs=ALL',
+            ],
+          }],
+        ],
+      },
+      'sources': [
+        'src/mojo/public/c/system/buffer.h',
+        'src/mojo/public/c/system/core.h',
+        'src/mojo/public/c/system/data_pipe.h',
+        'src/mojo/public/c/system/functions.h',
+        'src/mojo/public/c/system/macros.h',
+        'src/mojo/public/c/system/message_pipe.h',
+        'src/mojo/public/c/system/system_export.h',
+        'src/mojo/public/c/system/types.h',
+        'src/mojo/public/platform/native/system_thunks.cc',
+        'src/mojo/public/platform/native/system_thunks.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/bindings
+      'target_name': 'mojo_cpp_bindings',
+      'type': 'static_library',
+      'include_dirs': [
+        '../..'
+      ],
+      'sources': [
+        'src/mojo/public/cpp/bindings/array.h',
+        'src/mojo/public/cpp/bindings/binding.h',
+        'src/mojo/public/cpp/bindings/callback.h',
+        'src/mojo/public/cpp/bindings/error_handler.h',
+        'src/mojo/public/cpp/bindings/interface_impl.h',
+        'src/mojo/public/cpp/bindings/interface_ptr.h',
+        'src/mojo/public/cpp/bindings/interface_request.h',
+        'src/mojo/public/cpp/bindings/message.h',
+        'src/mojo/public/cpp/bindings/message_filter.h',
+        'src/mojo/public/cpp/bindings/no_interface.h',
+        'src/mojo/public/cpp/bindings/string.h',
+        'src/mojo/public/cpp/bindings/strong_binding.h',
+        'src/mojo/public/cpp/bindings/type_converter.h',
+        'src/mojo/public/cpp/bindings/lib/array_internal.h',
+        'src/mojo/public/cpp/bindings/lib/array_internal.cc',
+        'src/mojo/public/cpp/bindings/lib/array_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/bindings_internal.h',
+        'src/mojo/public/cpp/bindings/lib/bindings_serialization.cc',
+        'src/mojo/public/cpp/bindings/lib/bindings_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/bounds_checker.cc',
+        'src/mojo/public/cpp/bindings/lib/bounds_checker.h',
+        'src/mojo/public/cpp/bindings/lib/buffer.h',
+        'src/mojo/public/cpp/bindings/lib/callback_internal.h',
+        'src/mojo/public/cpp/bindings/lib/connector.cc',
+        'src/mojo/public/cpp/bindings/lib/connector.h',
+        'src/mojo/public/cpp/bindings/lib/filter_chain.cc',
+        'src/mojo/public/cpp/bindings/lib/filter_chain.h',
+        'src/mojo/public/cpp/bindings/lib/fixed_buffer.cc',
+        'src/mojo/public/cpp/bindings/lib/fixed_buffer.h',
+        'src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_data_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/message.cc',
+        'src/mojo/public/cpp/bindings/lib/message_builder.cc',
+        'src/mojo/public/cpp/bindings/lib/message_builder.h',
+        'src/mojo/public/cpp/bindings/lib/message_filter.cc',
+        'src/mojo/public/cpp/bindings/lib/message_header_validator.cc',
+        'src/mojo/public/cpp/bindings/lib/message_header_validator.h',
+        'src/mojo/public/cpp/bindings/lib/message_internal.h',
+        'src/mojo/public/cpp/bindings/lib/message_queue.cc',
+        'src/mojo/public/cpp/bindings/lib/message_queue.h',
+        'src/mojo/public/cpp/bindings/lib/no_interface.cc',
+        'src/mojo/public/cpp/bindings/lib/router.cc',
+        'src/mojo/public/cpp/bindings/lib/router.h',
+        'src/mojo/public/cpp/bindings/lib/shared_data.h',
+        'src/mojo/public/cpp/bindings/lib/shared_ptr.h',
+        'src/mojo/public/cpp/bindings/lib/string_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/string_serialization.cc',
+        'src/mojo/public/cpp/bindings/lib/validate_params.h',
+        'src/mojo/public/cpp/bindings/lib/validation_errors.cc',
+        'src/mojo/public/cpp/bindings/lib/validation_errors.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/js
+      'target_name': 'mojo_js_bindings',
+      'type': 'static_library',
+      'include_dirs': [
+        '../..'
+      ],
+      'sources': [
+        'src/mojo/public/js/constants.cc',
+        'src/mojo/public/js/constants.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/environment:standalone
+      'target_name': 'mojo_environment_standalone',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/c/environment/async_waiter.h',
+        'src/mojo/public/c/environment/logger.h',
+        'src/mojo/public/cpp/environment/async_waiter.h',
+        'src/mojo/public/cpp/environment/environment.h',
+        'src/mojo/public/cpp/environment/lib/async_waiter.cc',
+        'src/mojo/public/cpp/environment/lib/default_async_waiter.cc',
+        'src/mojo/public/cpp/environment/lib/default_async_waiter.h',
+        'src/mojo/public/cpp/environment/lib/default_logger.cc',
+        'src/mojo/public/cpp/environment/lib/default_logger.h',
+        'src/mojo/public/cpp/environment/lib/environment.cc',
+        'src/mojo/public/cpp/environment/lib/logging.cc',
+        'src/mojo/public/cpp/environment/logging.h',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/utility
+      'target_name': 'mojo_utility',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/utility/mutex.h',
+        'src/mojo/public/cpp/utility/run_loop.h',
+        'src/mojo/public/cpp/utility/run_loop_handler.h',
+        'src/mojo/public/cpp/utility/thread.h',
+        'src/mojo/public/cpp/utility/lib/mutex.cc',
+        'src/mojo/public/cpp/utility/lib/run_loop.cc',
+        'src/mojo/public/cpp/utility/lib/thread.cc',
+        'src/mojo/public/cpp/utility/lib/thread_local.h',
+        'src/mojo/public/cpp/utility/lib/thread_local_posix.cc',
+        'src/mojo/public/cpp/utility/lib/thread_local_win.cc',
+      ],
+      'conditions': [
+        # See crbug.com/342893:
+        ['OS=="win"', {
+          'sources!': [
+            'src/mojo/public/cpp/utility/mutex.h',
+            'src/mojo/public/cpp/utility/thread.h',
+            'src/mojo/public/cpp/utility/lib/mutex.cc',
+            'src/mojo/public/cpp/utility/lib/thread.cc',
+          ],
+        }],
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+    },
+    {
+      'target_name': 'mojo_application_bindings_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'src/mojo/public/interfaces/application/application.mojom',
+          'src/mojo/public/interfaces/application/service_provider.mojom',
+          'src/mojo/public/interfaces/application/shell.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
+      # GN version: //mojo/public/interfaces/application:application
+      'target_name': 'mojo_application_bindings',
+      'type': 'static_library',
+      'dependencies': [
+        'mojo_application_bindings_mojom',
+        'mojo_cpp_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_cpp_bindings',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application
+      'target_name': 'mojo_application_base',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/application/application_connection.h',
+        'src/mojo/public/cpp/application/application_delegate.h',
+        'src/mojo/public/cpp/application/application_impl.h',
+        'src/mojo/public/cpp/application/connect.h',
+        'src/mojo/public/cpp/application/interface_factory.h',
+        'src/mojo/public/cpp/application/interface_factory_impl.h',
+        'src/mojo/public/cpp/application/lib/application_connection.cc',
+        'src/mojo/public/cpp/application/lib/application_delegate.cc',
+        'src/mojo/public/cpp/application/lib/application_impl.cc',
+        'src/mojo/public/cpp/application/lib/service_provider_impl.cc',
+        'src/mojo/public/cpp/application/lib/service_connector.cc',
+        'src/mojo/public/cpp/application/lib/service_connector.h',
+        'src/mojo/public/cpp/application/lib/service_registry.cc',
+        'src/mojo/public/cpp/application/lib/service_registry.h',
+        'src/mojo/public/cpp/application/lib/weak_service_provider.cc',
+        'src/mojo/public/cpp/application/lib/weak_service_provider.h',
+        'src/mojo/public/cpp/application/service_provider_impl.h',
+      ],
+      'dependencies': [
+        'mojo_application_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_application_bindings',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application:standalone"
+      'target_name': 'mojo_application_standalone',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/application/lib/application_runner.cc',
+        'src/mojo/public/cpp/application/application_runner.h',
+      ],
+      'dependencies': [
+        'mojo_application_base',
+        'mojo_environment_standalone',
+      ],
+      'export_dependent_settings': [
+        'mojo_application_base',
+      ],
+    },
+    {
+      # GN version: //mojo/public/c/test_support
+      'target_name': 'mojo_test_support',
+      'defines': [
+        'MOJO_TEST_SUPPORT_IMPLEMENTATION',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },
+      'sources': [
+        'src/mojo/public/c/test_support/test_support.h',
+        'src/mojo/public/c/test_support/test_support_export.h',
+        # TODO(vtl): Convert this to thunks http://crbug.com/386799
+        'src/mojo/public/tests/test_support_private.cc',
+        'src/mojo/public/tests/test_support_private.h',
+      ],
+      'conditions': [
+        ['OS=="ios"', {
+          'type': 'static_library',
+        }, {
+          'type': 'shared_library',
+        }],
+        ['OS=="mac"', {
+          'xcode_settings': {
+            # Make it a run-path dependent library.
+            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+          },
+        }],
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/test_support:test_utils
+      'target_name': 'mojo_public_test_utils',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
+        'mojo_test_support',
+      ],
+      'sources': [
+        'src/mojo/public/cpp/test_support/lib/test_support.cc',
+        'src/mojo/public/cpp/test_support/lib/test_utils.cc',
+        'src/mojo/public/cpp/test_support/test_utils.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils
+      'target_name': 'mojo_public_bindings_test_utils',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+      ],
+      'sources': [
+        'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc',
+        'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h',
+      ],
+    },
+    {
+      'target_name': 'mojo_public_test_interfaces_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'src/mojo/public/interfaces/bindings/tests/math_calculator.mojom',
+          'src/mojo/public/interfaces/bindings/tests/no_module.mojom',
+          'src/mojo/public/interfaces/bindings/tests/rect.mojom',
+          'src/mojo/public/interfaces/bindings/tests/regression_tests.mojom',
+          'src/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_factory.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_import.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_import2.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_service.mojom',
+          'src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom',
+          'src/mojo/public/interfaces/bindings/tests/test_structs.mojom',
+          'src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
+      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
+      'target_name': 'mojo_public_test_interfaces',
+      'type': 'static_library',
+      'export_dependent_settings': [
+        'mojo_cpp_bindings',
+      ],
+      'dependencies': [
+        'mojo_public_test_interfaces_mojom',
+        'mojo_cpp_bindings',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS == "android"', {
+      'targets': [
+        {
+          # GN version: //mojo/public/java_system
+          'target_name': 'mojo_public_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'src/mojo/public/java/system',
+          },
+          'includes': [ '../../build/java.gypi' ],
+        },
+        {
+        # GN version: //mojo/public/java_bindings
+          'target_name': 'mojo_bindings_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'src/mojo/public/java/bindings',
+           },
+           'dependencies': [
+             'mojo_public_java',
+           ],
+           'includes': [ '../../build/java.gypi' ],
+        },
+      ],
+    }],
+  ],
+}

third_party/mojo/mojo_variables.gypi

@@ -32,21 +32,21 @@
       # which Mojo system library they are using.
       #
       ['component=="shared_library"', {
-        'mojo_system_for_component': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",
         'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl",
+        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
+        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
       }, {
-        'mojo_system_for_component': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system_placeholder",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system",
         'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
+        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system_placeholder",
+        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system",
       }],
     ],
     'mojo_public_system_unittest_sources': [
-      '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc',
-      '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c',
-      '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc',
-      '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc',
-      '<(DEPTH)/mojo/public/cpp/system/tests/macros_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc',
     ],
   },
 }

third_party/mojo/mojom_bindings_generator.gypi

@@ -15,7 +15,8 @@
             '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'mojom_import_args%': [
-         '-I<(DEPTH)'
+         '-I<(DEPTH)',
+         '-I<(DEPTH)/third_party/mojo/src'
         ],
       },
       'inputs': [
@@ -43,12 +44,16 @@
   ],
   'include_dirs': [
     '<(DEPTH)',
+    '<(DEPTH)/third_party/mojo/src',
     '<(SHARED_INTERMEDIATE_DIR)',
+    '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
       '<(DEPTH)',
+      '<(DEPTH)/third_party/mojo/src',
       '<(SHARED_INTERMEDIATE_DIR)',
+      '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
     ],
     'variables': {
       'generated_src_dirs': [

third_party/mojo/mojom_bindings_generator_explicit.gypi

@@ -10,7 +10,7 @@
     'mojom_base_output_dir':
         '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
     'mojom_generated_outputs': [
-      '<!@(python <(DEPTH)/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
+      '<!@(python <(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
     ],
   },
   # Given mojom files as inputs, generate sources.  These sources will be
@@ -23,7 +23,8 @@
       'variables': {
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'mojom_import_args%': [
-         '-I<(DEPTH)'
+         '-I<(DEPTH)',
+         '-I<(DEPTH)/third_party/mojo/src'
         ],
       },
       'inputs': [
@@ -58,7 +59,9 @@
     # Include paths needed to compile the generated sources into a library.
     'include_dirs': [
       '<(DEPTH)',
+      '<(DEPTH)/third_party/mojo/src',
       '<(SHARED_INTERMEDIATE_DIR)',
+      '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
     ],
     # Make sure the generated header files are available for any static library
     # that depends on a static library that depends on this generator.
@@ -68,7 +71,9 @@
       # transitive dependancies when using the library.
       'include_dirs': [
         '<(DEPTH)',
+        '<(DEPTH)/third_party/mojo/src',
         '<(SHARED_INTERMEDIATE_DIR)',
+        '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
       ],
       'variables': {
         'generated_src_dirs': [

third_party/mojo/mojom_bindings_generator_variables.gypi

@@ -0,0 +1,66 @@
+# 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.
+
+{
+  'variables': {
+    'mojom_bindings_generator':
+        '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py',
+    'mojom_bindings_generator_sources': [
+      '<(mojom_bindings_generator)',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_python_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py',
+    ]
+  }
+}