Move mojo gypfiles to toplevel mojo

These files are owned by chromium now. It would not only be weird to inject them into the rolled mojo directory structure, but doing so would unnecessarily complicate the mojo up-rev procedure. BUG=None TBR=darin@chromium.org Review URL: https://codereview.chromium.org/807773002 Cr-Commit-Position: refs/heads/master@{#308622}
author: rockot <rockot@chromium.org> 2014-12-16 10:48:54 -0800
committer: Commit bot <commit-bot@chromium.org> 2014-12-16 18:49:16 +0000
commit: 829dc9ae81e2ad2f6b890dde15cbe2fc299bc711 (patch)
tree: e6efa5fc37e4da6499ec84aa54997b83fb2a90f5
parent: 7e9b46ebc6c08d327da7a9c1047602a6ec720d23 (diff)
download: chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.zip
chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.gz
chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.bz2
37 files changed, 1004 insertions, 1004 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 8b920b7..9316b49 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -49,18 +49,18 @@
             # NOTE: This list of targets is present because
             # mojo_base.gyp:mojo_base cannot be built on iOS, as
             # javascript-related targets cause v8 to be built.
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests',
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests',
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests',
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_public_utility_unittests',
-            '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/edk/mojo_edk_tests.gyp:mojo_system_unittests',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_common_unittests',
-            '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/public/mojo_public.gyp:mojo_public_test_utils',
-            '../mojo/public/mojo_public.gyp:mojo_system',
+            '../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',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 34f01e2..2cbe901 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3021,11 +3021,11 @@
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/cast/cast.gyp:cast_net',
             '../media/media.gyp:media',
-            '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/public/mojo_public.gyp:mojo_js_bindings',
+            '../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',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f953e47..02e8a48 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2696,7 +2696,7 @@
             '../components/components.gyp:translate_content_common',
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/media.gyp:media',
-            '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
+            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 68bede5..19f9dee 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1921,8 +1921,8 @@
         'common',
         'test_support_common',
         '../base/base.gyp:base',
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../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',
diff --git a/chrome/chrome_web_ui_mojo_bindings.gyp b/chrome/chrome_web_ui_mojo_bindings.gyp
index 4419898..d15f84e 100644
--- a/chrome/chrome_web_ui_mojo_bindings.gyp
+++ b/chrome/chrome_web_ui_mojo_bindings.gyp
@@ -13,7 +13,7 @@
       'sources': [
         'browser/ui/webui/omnibox/omnibox.mojom',
       ],
-      'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
     },
   ],
 }
diff --git a/content/content.gyp b/content/content.gyp
index b5b3cf5..0e91372 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -431,8 +431,8 @@
             '../device/vibration/vibration.gyp:device_vibration_java',
             '../media/media.gyp:media_java',
             '../mojo/mojo_base.gyp:mojo_system_java',
-            '../mojo/public/mojo_public.gyp:mojo_application_bindings',
-            '../mojo/public/mojo_public.gyp:mojo_bindings_java',
+            '../mojo/mojo_public.gyp:mojo_application_bindings',
+            '../mojo/mojo_public.gyp:mojo_bindings_java',
             '../net/net.gyp:net',
             '../ui/android/ui_android.gyp:ui_java',
             '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 7a02259..bfb5d46 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -10,8 +10,8 @@
     '../base/base.gyp:base',
     '../base/base.gyp:base_i18n',
     '../crypto/crypto.gyp:crypto',
-    '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
+    '../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',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7f41dce..0e9dc48 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1659,8 +1659,8 @@
         'browser/devtools/devtools.gyp:devtools_protocol_handler',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-        '../mojo/public/mojo_public.gyp:mojo_js_bindings',
+        '../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',
@@ -1670,7 +1670,7 @@
         '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
       ],
       'export_dependent_settings': [
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     }],
     ['enable_basic_printing==1 or enable_print_preview==1', {
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ca71117..e32344f 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -570,10 +570,10 @@
         '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../mojo/mojo_public.gyp:mojo_application_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',
@@ -581,8 +581,8 @@
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
       ],
       'export_dependent_settings' : [
-        '../mojo/public/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_application_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'actions': [
         {
diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp
index 1a969ed..fb635af 100644
--- a/content/content_common_mojo_bindings.gyp
+++ b/content/content_common_mojo_bindings.gyp
@@ -20,7 +20,7 @@
           'public/common/permission_status.mojom',
         ],
       },
-      'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi' ],
+      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       'target_name': 'content_common_mojo_bindings',
@@ -29,8 +29,8 @@
       'dependencies': [
         'content_common_mojo_bindings_mojom',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_application_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ]
     },
   ]
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 2fd43c2..529d8a9 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -17,8 +17,8 @@
     '../jingle/jingle.gyp:jingle_glue',
     '../media/blink/media_blink.gyp:media_blink',
     '../media/media.gyp:media',
-    '../mojo/edk/mojo_edk.gyp:mojo_js_lib',
     '../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',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ec10f26..c8cf44a 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -203,8 +203,8 @@
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../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',
@@ -387,9 +387,9 @@
         '../crypto/crypto.gyp:crypto',
         '../device/battery/battery.gyp:device_battery',
         '../device/battery/battery.gyp:device_battery_mojo_bindings',
-        '../mojo/edk/mojo_edk.gyp:mojo_common_test_support',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../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',
@@ -1143,14 +1143,14 @@
           'target_name': 'web_ui_test_mojo_bindings',
           'type': 'static_library',
           'dependencies': [
-            '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
           'sources': [
             'test/data/web_ui_test_mojo_bindings.mojom',
           ],
-          'includes': [ '../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
+          'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
           'export_dependent_settings': [
-            '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
         },
         {
@@ -1176,11 +1176,11 @@
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
-            '../mojo/edk/mojo_edk.gyp:mojo_common_test_support',
-            '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/public/mojo_public.gyp:mojo_js_bindings',
+            '../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',
@@ -1909,7 +1909,7 @@
             '../device/battery/battery.gyp:device_battery_javatests',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
-            '../mojo/public/mojo_public.gyp:mojo_public_test_interfaces',
+            '../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',
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
index 5c2a4c6..f8bbb19 100644
--- a/device/battery/battery.gyp
+++ b/device/battery/battery.gyp
@@ -12,7 +12,7 @@
       'target_name': 'device_battery_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
+        '../../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'battery_monitor.mojom',
@@ -26,9 +26,9 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_battery_mojo_bindings',
       ],
       'defines': [
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index 9bc0738..a768bc3 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -12,9 +12,9 @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:test_support_base',
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
diff --git a/device/serial/serial.gyp b/device/serial/serial.gyp
index e3eca58..454bb05 100644
--- a/device/serial/serial.gyp
+++ b/device/serial/serial.gyp
@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in device_serial
       'type': 'none',
       'includes': [
-        '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
+        '../../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'data_stream.mojom',
@@ -42,12 +42,12 @@
       ],
       'dependencies': [
         'device_serial_mojo',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../net/net.gyp:net',
       ],
       'export_dependent_settings': [
         'device_serial_mojo',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/device/serial/data_stream.mojom.cc',
diff --git a/device/vibration/vibration.gyp b/device/vibration/vibration.gyp
index 7a3e8b3..93133be 100644
--- a/device/vibration/vibration.gyp
+++ b/device/vibration/vibration.gyp
@@ -12,7 +12,7 @@
       'target_name': 'device_vibration_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
+        '../../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'vibration_manager.mojom',
@@ -25,9 +25,9 @@
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_vibration_mojo_bindings',
       ],
       'defines': [
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 5392133..198a18d 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in extensions_common
       'type': 'none',
       'includes': [
-        '../mojo/public/tools/bindings/mojom_bindings_generator.gypi',
+        '../mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'common/mojo/keep_alive.mojom',
@@ -858,7 +858,7 @@
         'extensions_resources.gyp:extensions_resources',
         '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
-        '../mojo/public/mojo_public.gyp:mojo_js_bindings',
+        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
       ],
       'include_dirs': [
@@ -1168,10 +1168,10 @@
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../device/serial/serial.gyp:device_serial',
         '../device/serial/serial.gyp:device_serial_test_util',
-        '../mojo/edk/mojo_edk.gyp:mojo_js_lib',
-        '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../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',
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 7818688..1e04ee1 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -34,8 +34,8 @@
         '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
-        '<(DEPTH)/mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '<(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)/v8/tools/gyp/v8.gyp:v8',
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
index 1ca1775..1f27711 100644
--- a/ipc/mojo/ipc_mojo.gyp
+++ b/ipc/mojo/ipc_mojo.gyp
@@ -17,14 +17,14 @@
       'defines': [
         'IPC_MOJO_IMPLEMENTATION',
       ],
-      'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         '../ipc.gyp:ipc',
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         'client_channel.mojom',
@@ -54,9 +54,9 @@
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
         'ipc_mojo',
       ],
@@ -81,9 +81,9 @@
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
         '../../base/base.gyp:test_support_perf',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
         'ipc_mojo',
       ],
diff --git a/mojo/edk/mojo_edk_system_impl.gypi b/mojo/edk/mojo_edk_system_impl.gypi
deleted file mode 100644
index 2061527..0000000
--- a/mojo/edk/mojo_edk_system_impl.gypi
+++ /dev/null
@@ -1,131 +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/edk/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': [
-    'embedder/configuration.h',
-    'embedder/channel_info_forward.h',
-    'embedder/channel_init.cc',
-    'embedder/channel_init.h',
-    'embedder/embedder.cc',
-    'embedder/embedder.h',
-    'embedder/embedder_internal.h',
-    'embedder/entrypoints.cc',
-    'embedder/platform_channel_pair.cc',
-    'embedder/platform_channel_pair.h',
-    'embedder/platform_channel_pair_posix.cc',
-    'embedder/platform_channel_pair_win.cc',
-    'embedder/platform_channel_utils_posix.cc',
-    'embedder/platform_channel_utils_posix.h',
-    'embedder/platform_handle.cc',
-    'embedder/platform_handle.h',
-    'embedder/platform_handle_utils.h',
-    'embedder/platform_handle_utils_posix.cc',
-    'embedder/platform_handle_utils_win.cc',
-    'embedder/platform_handle_vector.h',
-    'embedder/platform_shared_buffer.h',
-    'embedder/platform_support.h',
-    'embedder/scoped_platform_handle.h',
-    'embedder/simple_platform_shared_buffer.cc',
-    'embedder/simple_platform_shared_buffer.h',
-    'embedder/simple_platform_shared_buffer_android.cc',
-    'embedder/simple_platform_shared_buffer_posix.cc',
-    'embedder/simple_platform_shared_buffer_win.cc',
-    'embedder/simple_platform_support.cc',
-    'embedder/simple_platform_support.h',
-    'system/awakable.h',
-    'system/awakable_list.cc',
-    'system/awakable_list.h',
-    'system/channel.cc',
-    'system/channel.h',
-    'system/channel_endpoint.cc',
-    'system/channel_endpoint.h',
-    'system/channel_endpoint_client.h',
-    'system/channel_endpoint_id.cc',
-    'system/channel_endpoint_id.h',
-    'system/channel_info.cc',
-    'system/channel_info.h',
-    'system/channel_manager.cc',
-    'system/channel_manager.h',
-    'system/configuration.cc',
-    'system/configuration.h',
-    'system/core.cc',
-    'system/core.h',
-    'system/data_pipe.cc',
-    'system/data_pipe.h',
-    'system/data_pipe_consumer_dispatcher.cc',
-    'system/data_pipe_consumer_dispatcher.h',
-    'system/data_pipe_producer_dispatcher.cc',
-    'system/data_pipe_producer_dispatcher.h',
-    'system/dispatcher.cc',
-    'system/dispatcher.h',
-    'system/endpoint_relayer.cc',
-    'system/endpoint_relayer.h',
-    'system/handle_signals_state.h',
-    'system/handle_table.cc',
-    'system/handle_table.h',
-    'system/incoming_endpoint.cc',
-    'system/incoming_endpoint.h',
-    'system/local_data_pipe.cc',
-    'system/local_data_pipe.h',
-    'system/local_message_pipe_endpoint.cc',
-    'system/local_message_pipe_endpoint.h',
-    'system/mapping_table.cc',
-    'system/mapping_table.h',
-    'system/memory.cc',
-    'system/memory.h',
-    'system/message_in_transit.cc',
-    'system/message_in_transit.h',
-    'system/message_in_transit_queue.cc',
-    'system/message_in_transit_queue.h',
-    'system/message_pipe.cc',
-    'system/message_pipe.h',
-    'system/message_pipe_dispatcher.cc',
-    'system/message_pipe_dispatcher.h',
-    'system/message_pipe_endpoint.cc',
-    'system/message_pipe_endpoint.h',
-    'system/options_validation.h',
-    'system/platform_handle_dispatcher.cc',
-    'system/platform_handle_dispatcher.h',
-    'system/proxy_message_pipe_endpoint.cc',
-    'system/proxy_message_pipe_endpoint.h',
-    'system/raw_channel.cc',
-    'system/raw_channel.h',
-    'system/raw_channel_posix.cc',
-    'system/raw_channel_win.cc',
-    'system/shared_buffer_dispatcher.cc',
-    'system/shared_buffer_dispatcher.h',
-    'system/simple_dispatcher.cc',
-    'system/simple_dispatcher.h',
-    'system/transport_data.cc',
-    'system/transport_data.h',
-    'system/waiter.cc',
-    '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.
-    'embedder/test_embedder.cc',
-    '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',
-      ],
-    }],
-  ],
-}
diff --git a/mojo/edk/mojo_edk_tests.gyp b/mojo/edk/mojo_edk_tests.gyp
deleted file mode 100644
index bcd71e7..0000000
--- a/mojo/edk/mojo_edk_tests.gyp
+++ /dev/null
@@ -1,279 +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_edk_tests',
-      'type': 'none',
-      'dependencies': [
-        # NOTE: If adding a new dependency here, please consider whether it
-        # should also be added to the list of Mojo-related dependencies of
-        # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
-        # target on iOS due to the presence of the js targets, which cause v8
-        # to be built.
-        'mojo_message_pipe_perftests',
-        'mojo_public_application_unittests',
-        'mojo_public_bindings_unittests',
-        'mojo_public_environment_unittests',
-        'mojo_public_system_perftests',
-        'mojo_public_system_unittests',
-        'mojo_public_utility_unittests',
-        'mojo_system_unittests',
-        'mojo_js_unittests',
-        'mojo_js_integration_tests',
-      ],
-    },
-    # TODO(vtl): Reorganize the mojo_public_*_unittests.
-    {
-      # GN version: //mojo/edk/test:mojo_public_bindings_unittests
-      'target_name': 'mojo_public_bindings_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        '../public/mojo_public.gyp:mojo_cpp_bindings',
-        '../public/mojo_public.gyp:mojo_environment_standalone',
-        '../public/mojo_public.gyp:mojo_public_bindings_test_utils',
-        '../public/mojo_public.gyp:mojo_public_test_interfaces',
-        '../public/mojo_public.gyp:mojo_public_test_utils',
-        '../public/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',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/test:mojo_public_environment_unittests
-      'target_name': 'mojo_public_environment_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        '../public/mojo_public.gyp:mojo_environment_standalone',
-        '../public/mojo_public.gyp:mojo_public_test_utils',
-        '../public/mojo_public.gyp:mojo_utility',
-      ],
-      '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',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/test:mojo_public_application_unittests
-      'target_name': 'mojo_public_application_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        '../public/mojo_public.gyp:mojo_application_standalone',
-        '../public/mojo_public.gyp:mojo_utility',
-        '../public/mojo_public.gyp:mojo_environment_standalone',
-      ],
-      'sources': [
-        '../public/cpp/application/tests/service_registry_unittest.cc',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/system/tests:mojo_public_system_unittests
-      # and         //mojo/public/c/system/tests
-      'target_name': 'mojo_public_system_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        '../public/mojo_public.gyp:mojo_public_test_utils',
-      ],
-      'include_dirs': [ '../..' ],
-      'sources': [
-        '<@(mojo_public_system_unittest_sources)',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/application/tests:mojo_public_utility_unittests
-      'target_name': 'mojo_public_utility_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        '../public/mojo_public.gyp:mojo_public_test_utils',
-        '../public/mojo_public.gyp:mojo_utility',
-      ],
-      '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',
-      ],
-      'conditions': [
-        # See crbug.com/342893:
-        ['OS=="win"', {
-          'sources!': [
-            '../public/cpp/utility/tests/mutex_unittest.cc',
-            '../public/cpp/utility/tests/thread_unittest.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/edk/test:mojo_public_system_perftests
-      'target_name': 'mojo_public_system_perftests',
-      'type': 'executable',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_run_all_perftests',
-        '../public/mojo_public.gyp:mojo_public_test_utils',
-        '../public/mojo_public.gyp:mojo_utility',
-      ],
-      'sources': [
-        '../public/c/system/tests/core_perftest.cc',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/system:mojo_system_unittests
-      'target_name': 'mojo_system_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_common_test_support',
-        'mojo_edk.gyp:mojo_system_impl',
-      ],
-      'sources': [
-        'embedder/embedder_unittest.cc',
-        'embedder/platform_channel_pair_posix_unittest.cc',
-        'embedder/simple_platform_shared_buffer_unittest.cc',
-        'system/awakable_list_unittest.cc',
-        'system/channel_endpoint_id_unittest.cc',
-        'system/channel_manager_unittest.cc',
-        'system/channel_unittest.cc',
-        'system/core_unittest.cc',
-        'system/core_test_base.cc',
-        'system/core_test_base.h',
-        'system/data_pipe_unittest.cc',
-        'system/dispatcher_unittest.cc',
-        'system/local_data_pipe_unittest.cc',
-        'system/memory_unittest.cc',
-        'system/message_pipe_dispatcher_unittest.cc',
-        'system/message_pipe_test_utils.h',
-        'system/message_pipe_test_utils.cc',
-        'system/message_pipe_unittest.cc',
-        'system/multiprocess_message_pipe_unittest.cc',
-        'system/options_validation_unittest.cc',
-        'system/platform_handle_dispatcher_unittest.cc',
-        'system/raw_channel_unittest.cc',
-        'system/remote_message_pipe_unittest.cc',
-        'system/run_all_unittests.cc',
-        'system/shared_buffer_dispatcher_unittest.cc',
-        'system/simple_dispatcher_unittest.cc',
-        'system/test_utils.cc',
-        'system/test_utils.h',
-        'system/waiter_test_utils.cc',
-        'system/waiter_test_utils.h',
-        'system/waiter_unittest.cc',
-        'test/multiprocess_test_helper_unittest.cc',
-      ],
-      'conditions': [
-        ['OS=="ios"', {
-          'sources!': [
-            'embedder/embedder_unittest.cc',
-            'system/multiprocess_message_pipe_unittest.cc',
-            'test/multiprocess_test_helper_unittest.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/edk/system:mojo_message_pipe_perftests
-      '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',
-        'mojo_edk.gyp:mojo_common_test_support',
-        'mojo_edk.gyp:mojo_system_impl',
-      ],
-      'sources': [
-        'system/message_pipe_perftest.cc',
-        'system/message_pipe_test_utils.h',
-        'system/message_pipe_test_utils.cc',
-        'system/test_utils.cc',
-        'system/test_utils.h',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/js/test:js_unittests
-      'target_name': 'mojo_js_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../../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',
-        '../public/mojo_public.gyp:mojo_environment_standalone',
-        '../public/mojo_public.gyp:mojo_public_test_interfaces',
-        '../public/mojo_public.gyp:mojo_utility',
-      ],
-      'sources': [
-        'js/handle_unittest.cc',
-        'js/test/run_js_tests.cc',
-      ],
-    },
-    {
-      # GN version: //mojo/edk/js/test:js_integration_tests
-      'target_name': 'mojo_js_integration_tests',
-      'type': 'executable',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../gin/gin.gyp:gin_test',
-        '../public/mojo_public.gyp:mojo_environment_standalone',
-        '../public/mojo_public.gyp:mojo_public_test_interfaces',
-        '../public/mojo_public.gyp:mojo_utility',
-        'mojo_edk.gyp:mojo_js_lib',
-        'mojo_edk.gyp:mojo_run_all_unittests',
-        'mojo_js_to_cpp_bindings',
-      ],
-      'sources': [
-        'js/test/run_js_integration_tests.cc',
-        'js/tests/js_to_cpp_tests',
-      ],
-    },
-    {
-      'target_name': 'mojo_js_to_cpp_bindings',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'js/tests/js_to_cpp.mojom',
-        ],
-      },
-      'includes': [ '../public/tools/bindings/mojom_bindings_generator_explicit.gypi' ],
-    },
-  ],
-}
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 10d0ae8..5c7bd14 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -12,12 +12,12 @@
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
-        'edk/mojo_edk_tests.gyp:mojo_edk_tests',
         'mojo_base.gyp:mojo_base',
+        'mojo_edk_tests.gyp:mojo_edk_tests',
         'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'mojo_input_events_converters.gyp:mojo_input_events_lib',
-        'services/public/mojo_services_public.gyp:mojo_services_public',
-        'public/mojo_public.gyp:mojo_public',
+        'mojo_public.gyp:mojo_public',
+        'mojo_services_public.gyp:mojo_services_public',
       ],
     },
   ]
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index bab8c0e..32f6d0a 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -25,8 +25,8 @@
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
-            'public/mojo_public.gyp:mojo_bindings_java',
-            'public/mojo_public.gyp:mojo_public_java',
+            'mojo_public.gyp:mojo_bindings_java',
+            'mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
@@ -75,13 +75,13 @@
         '../base/base.gyp:base_message_loop_tests',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
-        'edk/mojo_edk.gyp:mojo_system_impl',
-        'edk/mojo_edk.gyp:mojo_common_test_support',
-        'edk/mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_common_lib',
+        'mojo_edk.gyp:mojo_system_impl',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_environment_chromium',
-        'public/mojo_public.gyp:mojo_cpp_bindings',
-        'public/mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
@@ -145,10 +145,10 @@
       'dependencies': [
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'public/mojo_public.gyp:mojo_application_base',
+        'mojo_public.gyp:mojo_application_base',
        ],
       'export_dependent_settings': [
-        'public/mojo_public.gyp:mojo_application_base',
+        'mojo_public.gyp:mojo_application_base',
        ],
     },
   ],
@@ -177,8 +177,8 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            'edk/mojo_edk.gyp:mojo_system_impl',
             'mojo_common_lib',
+            'mojo_edk.gyp:mojo_system_impl',
             'mojo_environment_chromium',
             'mojo_jni_headers',
           ],
@@ -202,7 +202,7 @@
           'dependencies': [
             '../base/base.gyp:base_java',
             'libmojo_system_java',
-            'public/mojo_public.gyp:mojo_public_java',
+            'mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',
diff --git a/mojo/edk/mojo_edk.gyp b/mojo/mojo_edk.gyp
index b85cae7..68b2aff 100644
--- a/mojo/edk/mojo_edk.gyp
+++ b/mojo/mojo_edk.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    '../mojo_variables.gypi',
+    'mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -12,8 +12,8 @@
       '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 +24,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.
-        'js/core.cc',
-        'js/core.h',
-        'js/drain_data.cc',
-        'js/drain_data.h',
-        'js/handle.cc',
-        'js/handle.h',
-        'js/handle_close_observer.h',
-        'js/mojo_runner_delegate.cc',
-        'js/mojo_runner_delegate.h',
-        'js/support.cc',
-        'js/support.h',
-        'js/threading.cc',
-        'js/threading.h',
-        'js/waiting_callback.cc',
-        'js/waiting_callback.h',
+        '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',
       ],
     },
     {
@@ -56,11 +56,11 @@
       'target_name': 'mojo_test_support_impl',
       'type': 'static_library',
       'dependencies': [
-        '../../base/base.gyp:base',
+        '../base/base.gyp:base',
       ],
       'sources': [
-        'test/test_support_impl.cc',
-        'test/test_support_impl.h',
+        'edk/test/test_support_impl.cc',
+        'edk/test/test_support_impl.h',
       ],
     },
     {
@@ -68,22 +68,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': [
-        'test/multiprocess_test_helper.cc',
-        'test/multiprocess_test_helper.h',
-        'test/test_utils.h',
-        'test/test_utils_posix.cc',
-        'test/test_utils_win.cc',
+        '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',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'test/multiprocess_test_helper.cc',
+            'edk/test/multiprocess_test_helper.cc',
           ],
         }],
       ],
@@ -93,15 +93,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',
-        '../public/mojo_public.gyp:mojo_test_support',
       ],
       'sources': [
-        'test/run_all_unittests.cc',
+        'edk/test/run_all_unittests.cc',
       ],
     },
     {
@@ -109,13 +109,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',
-        '../public/mojo_public.gyp:mojo_test_support',
       ],
       'sources': [
-        'test/run_all_perftests.cc',
+        'edk/test/run_all_perftests.cc',
       ],
     },
   ],
@@ -126,8 +126,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',
diff --git a/mojo/mojo_edk_system_impl.gypi b/mojo/mojo_edk_system_impl.gypi
new file mode 100644
index 0000000..3211db9
--- /dev/null
+++ b/mojo/mojo_edk_system_impl.gypi
@@ -0,0 +1,131 @@
+# 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/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',
+      ],
+    }],
+  ],
+}
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp
new file mode 100644
index 0000000..f3809b4
--- /dev/null
+++ b/mojo/mojo_edk_tests.gyp
@@ -0,0 +1,279 @@
+# 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_edk_tests',
+      'type': 'none',
+      'dependencies': [
+        # NOTE: If adding a new dependency here, please consider whether it
+        # should also be added to the list of Mojo-related dependencies of
+        # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
+        # target on iOS due to the presence of the js targets, which cause v8
+        # to be built.
+        'mojo_message_pipe_perftests',
+        'mojo_public_application_unittests',
+        'mojo_public_bindings_unittests',
+        'mojo_public_environment_unittests',
+        'mojo_public_system_perftests',
+        'mojo_public_system_unittests',
+        'mojo_public_utility_unittests',
+        'mojo_system_unittests',
+        'mojo_js_unittests',
+        'mojo_js_integration_tests',
+      ],
+    },
+    # TODO(vtl): Reorganize the mojo_public_*_unittests.
+    {
+      # GN version: //mojo/edk/test:mojo_public_bindings_unittests
+      'target_name': 'mojo_public_bindings_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_bindings_test_utils',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_public_test_utils',
+        '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',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_environment_unittests
+      'target_name': 'mojo_public_environment_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../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': [ '..' ],
+      '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',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_application_unittests
+      'target_name': 'mojo_public_application_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../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',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/system/tests:mojo_public_system_unittests
+      # and         //mojo/public/c/system/tests
+      'target_name': 'mojo_public_system_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_public_test_utils',
+      ],
+      'include_dirs': [ '..' ],
+      'sources': [
+        '<@(mojo_public_system_unittest_sources)',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application/tests:mojo_public_utility_unittests
+      'target_name': 'mojo_public_utility_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../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': [ '..' ],
+      'sources': [
+        'public/cpp/utility/tests/mutex_unittest.cc',
+        'public/cpp/utility/tests/run_loop_unittest.cc',
+        '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',
+          ],
+        }],
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_system_perftests
+      'target_name': 'mojo_public_system_perftests',
+      'type': 'executable',
+      'dependencies': [
+        '../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',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/system:mojo_system_unittests
+      'target_name': 'mojo_system_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../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',
+      ],
+      'conditions': [
+        ['OS=="ios"', {
+          'sources!': [
+            'edk/embedder/embedder_unittest.cc',
+            'edk/system/multiprocess_message_pipe_unittest.cc',
+            'edk/test/multiprocess_test_helper_unittest.cc',
+          ],
+        }],
+      ],
+    },
+    {
+      # GN version: //mojo/edk/system:mojo_message_pipe_perftests
+      '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',
+        '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',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/js/test:js_unittests
+      'target_name': 'mojo_js_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../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',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'edk/js/handle_unittest.cc',
+        'edk/js/test/run_js_tests.cc',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/js/test:js_integration_tests
+      'target_name': 'mojo_js_integration_tests',
+      'type': 'executable',
+      'dependencies': [
+        '../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',
+        'mojo_edk.gyp:mojo_js_lib',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_js_to_cpp_bindings',
+      ],
+      'sources': [
+        'edk/js/test/run_js_integration_tests.cc',
+        'edk/js/tests/js_to_cpp_tests',
+      ],
+    },
+    {
+      'target_name': 'mojo_js_to_cpp_bindings',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'edk/js/tests/js_to_cpp.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+  ],
+}
diff --git a/mojo/mojo_geometry_converters.gyp b/mojo/mojo_geometry_converters.gyp
index a6ef63c..e0bfb0b 100644
--- a/mojo/mojo_geometry_converters.gyp
+++ b/mojo/mojo_geometry_converters.gyp
@@ -18,7 +18,7 @@
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
+        'mojo_services_public.gyp:mojo_geometry_bindings',
         '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
diff --git a/mojo/mojo_input_events_converters.gyp b/mojo/mojo_input_events_converters.gyp
index 0754397..b212b5b 100644
--- a/mojo/mojo_input_events_converters.gyp
+++ b/mojo/mojo_input_events_converters.gyp
@@ -19,8 +19,8 @@
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_geometry_converters.gyp:mojo_geometry_lib',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
-        'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
+        'mojo_services_public.gyp:mojo_geometry_bindings',
+        'mojo_services_public.gyp:mojo_input_events_bindings',
         '<(mojo_system_for_component)',
       ],
       'sources': [
diff --git a/mojo/mojo_nacl.gyp b/mojo/mojo_nacl.gyp
index 397924f..660db45 100644
--- a/mojo/mojo_nacl.gyp
+++ b/mojo/mojo_nacl.gyp
@@ -62,7 +62,7 @@
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            'edk/mojo_edk.gyp:mojo_system_impl',
+            'mojo_edk.gyp:mojo_system_impl',
             'monacl_sel',
           ],
           'sources': [
diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
new file mode 100644
index 0000000..2eb5fc6
--- /dev/null
+++ b/mojo/mojo_public.gyp
@@ -0,0 +1,385 @@
+# 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',
+      ],
+    },
+    {
+      'target_name': 'mojo_public_none',
+      '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' ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/mojo/services/public/mojo_services_public.gyp b/mojo/mojo_services_public.gyp
index 55673c7..9846586 100644
--- a/mojo/services/public/mojo_services_public.gyp
+++ b/mojo/mojo_services_public.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    '../../mojo_variables.gypi',
+    'mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -31,14 +31,14 @@
       'target_name': 'mojo_clipboard_bindings',
       'type': 'static_library',
       'sources': [
-        '../clipboard/public/interfaces/clipboard.mojom',
+        'services/clipboard/public/interfaces/clipboard.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -46,18 +46,18 @@
       'target_name': 'mojo_input_events_bindings',
       'type': 'static_library',
       'sources': [
-        '../input_events/public/interfaces/input_event_constants.mojom',
-        '../input_events/public/interfaces/input_events.mojom',
-        '../input_events/public/interfaces/input_key_codes.mojom',
+        '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': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -65,14 +65,14 @@
       'target_name': 'mojo_geometry_bindings',
       'type': 'static_library',
       'sources': [
-        '../geometry/public/interfaces/geometry.mojom',
+        'services/geometry/public/interfaces/geometry.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -80,19 +80,19 @@
       'target_name': 'mojo_gpu_bindings',
       'type': 'static_library',
       'sources': [
-        '../gpu/public/interfaces/command_buffer.mojom',
-        '../gpu/public/interfaces/gpu.mojom',
-        '../gpu/public/interfaces/gpu_capabilities.mojom',
-        '../gpu/public/interfaces/viewport_parameter_listener.mojom',
+        'services/gpu/public/interfaces/command_buffer.mojom',
+        'services/gpu/public/interfaces/gpu.mojom',
+        'services/gpu/public/interfaces/gpu_capabilities.mojom',
+        'services/gpu/public/interfaces/viewport_parameter_listener.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -100,22 +100,22 @@
       'target_name': 'mojo_native_viewport_bindings',
       'type': 'static_library',
       'sources': [
-        '../native_viewport/public/interfaces/native_viewport.mojom',
+        'services/native_viewport/public/interfaces/native_viewport.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -123,15 +123,15 @@
       'target_name': 'mojo_navigation_bindings',
       'type': 'static_library',
       'sources': [
-        '../navigation/public/interfaces/navigation.mojom',
+        'services/navigation/public/interfaces/navigation.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -139,16 +139,16 @@
       'target_name': 'mojo_content_handler_bindings',
       'type': 'static_library',
       'sources': [
-        '../content_handler/public/interfaces/content_handler.mojom',
+        'services/content_handler/public/interfaces/content_handler.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        '../../public/mojo_public.gyp:mojo_application_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_application_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -156,23 +156,23 @@
       'target_name': 'mojo_network_bindings',
       'type': 'static_library',
       'sources': [
-        '../network/public/interfaces/cookie_store.mojom',
-        '../network/public/interfaces/net_address.mojom',
-        '../network/public/interfaces/network_error.mojom',
-        '../network/public/interfaces/network_service.mojom',
-        '../network/public/interfaces/tcp_bound_socket.mojom',
-        '../network/public/interfaces/tcp_connected_socket.mojom',
-        '../network/public/interfaces/tcp_server_socket.mojom',
-        '../network/public/interfaces/udp_socket.mojom',
-        '../network/public/interfaces/url_loader.mojom',
-        '../network/public/interfaces/web_socket.mojom',
-      ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+        'services/network/public/interfaces/cookie_store.mojom',
+        'services/network/public/interfaces/net_address.mojom',
+        'services/network/public/interfaces/network_error.mojom',
+        'services/network/public/interfaces/network_service.mojom',
+        'services/network/public/interfaces/tcp_bound_socket.mojom',
+        'services/network/public/interfaces/tcp_connected_socket.mojom',
+        'services/network/public/interfaces/tcp_server_socket.mojom',
+        'services/network/public/interfaces/udp_socket.mojom',
+        'services/network/public/interfaces/url_loader.mojom',
+        'services/network/public/interfaces/web_socket.mojom',
+      ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -180,7 +180,7 @@
       'target_name': 'mojo_view_manager_common',
       'type': 'static_library',
       'sources': [
-        '../view_manager/public/cpp/types.h',
+        'services/view_manager/public/cpp/types.h',
       ],
     },
     {
@@ -188,23 +188,23 @@
       'target_name': 'mojo_view_manager_bindings',
       'type': 'static_library',
       'sources': [
-        '../view_manager/public/interfaces/view_manager.mojom',
-        '../view_manager/public/interfaces/view_manager_constants.mojom',
+        'services/view_manager/public/interfaces/view_manager.mojom',
+        'services/view_manager/public/interfaces/view_manager_constants.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_public.gyp:mojo_application_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_application_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
+        'mojo_public.gyp:mojo_application_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_application_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -212,21 +212,21 @@
       'target_name': 'mojo_surfaces_bindings',
       'type': 'static_library',
       'sources': [
-        '../surfaces/public/interfaces/surfaces.mojom',
-        '../surfaces/public/interfaces/surfaces_service.mojom',
-        '../surfaces/public/interfaces/quads.mojom',
+        'services/surfaces/public/interfaces/surfaces.mojom',
+        'services/surfaces/public/interfaces/surfaces_service.mojom',
+        'services/surfaces/public/interfaces/quads.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -234,14 +234,14 @@
       'target_name': 'mojo_surface_id_bindings',
       'type': 'static_library',
       'sources': [
-        '../surfaces/public/interfaces/surface_id.mojom',
+        'services/surfaces/public/interfaces/surface_id.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -249,18 +249,18 @@
       'target_name': 'mojo_window_manager_bindings',
       'type': 'static_library',
       'sources': [
-        '../window_manager/public/interfaces/window_manager.mojom',
+        'services/window_manager/public/interfaces/window_manager.mojom',
       ],
-      'includes': [ '../../public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ 'mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_input_events_bindings',
-        '../../public/mojo_public.gyp:mojo_application_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_application_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_input_events_bindings',
-        '../../public/mojo_public.gyp:mojo_application_bindings',
-        '../../public/mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_application_bindings',
+        'mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
   ],
diff --git a/mojo/mojo_variables.gypi b/mojo/mojo_variables.gypi
index 6e73b5a..047b25a 100644
--- a/mojo/mojo_variables.gypi
+++ b/mojo/mojo_variables.gypi
@@ -32,12 +32,12 @@
       # which Mojo system library they are using.
       #
       ['component=="shared_library"', {
-        'mojo_system_for_component': "<(DEPTH)/mojo/edk/mojo_edk.gyp:mojo_system_impl",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/edk/mojo_edk.gyp:mojo_system_impl",
+        '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)/mojo/mojo_base.gyp:mojo_none",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/public/mojo_public.gyp:mojo_system",
+        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system",
         'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
       }],
     ],
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.gypi b/mojo/mojom_bindings_generator.gypi
index 4064df6..4064df6 100644
--- a/mojo/public/tools/bindings/mojom_bindings_generator.gypi
+++ b/mojo/mojom_bindings_generator.gypi
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi b/mojo/mojom_bindings_generator_explicit.gypi
index 0b836db..0b836db 100644
--- a/mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi
+++ b/mojo/mojom_bindings_generator_explicit.gypi
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator_variables.gypi b/mojo/mojom_bindings_generator_variables.gypi
index b4b53e6..b4b53e6 100644
--- a/mojo/public/tools/bindings/mojom_bindings_generator_variables.gypi
+++ b/mojo/mojom_bindings_generator_variables.gypi
diff --git a/mojo/public/mojo_public.gyp b/mojo/public/mojo_public.gyp
deleted file mode 100644
index 83e27d8..0000000
--- a/mojo/public/mojo_public.gyp
+++ /dev/null
@@ -1,385 +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',
-      ],
-    },
-    {
-      'target_name': 'mojo_none',
-      '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': [
-        'c/system/buffer.h',
-        'c/system/core.h',
-        'c/system/data_pipe.h',
-        'c/system/functions.h',
-        'c/system/macros.h',
-        'c/system/message_pipe.h',
-        'c/system/system_export.h',
-        'c/system/types.h',
-        'platform/native/system_thunks.cc',
-        'platform/native/system_thunks.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/bindings
-      'target_name': 'mojo_cpp_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '../..'
-      ],
-      'sources': [
-        'cpp/bindings/array.h',
-        'cpp/bindings/binding.h',
-        'cpp/bindings/callback.h',
-        'cpp/bindings/error_handler.h',
-        'cpp/bindings/interface_impl.h',
-        'cpp/bindings/interface_ptr.h',
-        'cpp/bindings/interface_request.h',
-        'cpp/bindings/message.h',
-        'cpp/bindings/message_filter.h',
-        'cpp/bindings/no_interface.h',
-        'cpp/bindings/string.h',
-        'cpp/bindings/strong_binding.h',
-        'cpp/bindings/type_converter.h',
-        'cpp/bindings/lib/array_internal.h',
-        'cpp/bindings/lib/array_internal.cc',
-        'cpp/bindings/lib/array_serialization.h',
-        'cpp/bindings/lib/bindings_internal.h',
-        'cpp/bindings/lib/bindings_serialization.cc',
-        'cpp/bindings/lib/bindings_serialization.h',
-        'cpp/bindings/lib/bounds_checker.cc',
-        'cpp/bindings/lib/bounds_checker.h',
-        'cpp/bindings/lib/buffer.h',
-        'cpp/bindings/lib/callback_internal.h',
-        'cpp/bindings/lib/connector.cc',
-        'cpp/bindings/lib/connector.h',
-        'cpp/bindings/lib/filter_chain.cc',
-        'cpp/bindings/lib/filter_chain.h',
-        'cpp/bindings/lib/fixed_buffer.cc',
-        'cpp/bindings/lib/fixed_buffer.h',
-        'cpp/bindings/lib/interface_ptr_internal.h',
-        'cpp/bindings/lib/map_data_internal.h',
-        'cpp/bindings/lib/map_internal.h',
-        'cpp/bindings/lib/map_serialization.h',
-        'cpp/bindings/lib/message.cc',
-        'cpp/bindings/lib/message_builder.cc',
-        'cpp/bindings/lib/message_builder.h',
-        'cpp/bindings/lib/message_filter.cc',
-        'cpp/bindings/lib/message_header_validator.cc',
-        'cpp/bindings/lib/message_header_validator.h',
-        'cpp/bindings/lib/message_internal.h',
-        'cpp/bindings/lib/message_queue.cc',
-        'cpp/bindings/lib/message_queue.h',
-        'cpp/bindings/lib/no_interface.cc',
-        'cpp/bindings/lib/router.cc',
-        'cpp/bindings/lib/router.h',
-        'cpp/bindings/lib/shared_data.h',
-        'cpp/bindings/lib/shared_ptr.h',
-        'cpp/bindings/lib/string_serialization.h',
-        'cpp/bindings/lib/string_serialization.cc',
-        'cpp/bindings/lib/validate_params.h',
-        'cpp/bindings/lib/validation_errors.cc',
-        'cpp/bindings/lib/validation_errors.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/js
-      'target_name': 'mojo_js_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '../..'
-      ],
-      'sources': [
-        'js/constants.cc',
-        'js/constants.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/environment:standalone
-      'target_name': 'mojo_environment_standalone',
-      'type': 'static_library',
-      'sources': [
-        'c/environment/async_waiter.h',
-        'c/environment/logger.h',
-        'cpp/environment/async_waiter.h',
-        'cpp/environment/environment.h',
-        'cpp/environment/lib/async_waiter.cc',
-        'cpp/environment/lib/default_async_waiter.cc',
-        'cpp/environment/lib/default_async_waiter.h',
-        'cpp/environment/lib/default_logger.cc',
-        'cpp/environment/lib/default_logger.h',
-        'cpp/environment/lib/environment.cc',
-        'cpp/environment/lib/logging.cc',
-        'cpp/environment/logging.h',
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/utility
-      'target_name': 'mojo_utility',
-      'type': 'static_library',
-      'sources': [
-        'cpp/utility/mutex.h',
-        'cpp/utility/run_loop.h',
-        'cpp/utility/run_loop_handler.h',
-        'cpp/utility/thread.h',
-        'cpp/utility/lib/mutex.cc',
-        'cpp/utility/lib/run_loop.cc',
-        'cpp/utility/lib/thread.cc',
-        'cpp/utility/lib/thread_local.h',
-        'cpp/utility/lib/thread_local_posix.cc',
-        'cpp/utility/lib/thread_local_win.cc',
-      ],
-      'conditions': [
-        # See crbug.com/342893:
-        ['OS=="win"', {
-          'sources!': [
-            'cpp/utility/mutex.h',
-            'cpp/utility/thread.h',
-            'cpp/utility/lib/mutex.cc',
-            'cpp/utility/lib/thread.cc',
-          ],
-        }],
-      ],
-      'include_dirs': [
-        '../..',
-      ],
-    },
-    {
-      'target_name': 'mojo_application_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'interfaces/application/application.mojom',
-          'interfaces/application/service_provider.mojom',
-          'interfaces/application/shell.mojom',
-        ],
-      },
-      'includes': [ 'tools/bindings/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': [
-        'cpp/application/application_connection.h',
-        'cpp/application/application_delegate.h',
-        'cpp/application/application_impl.h',
-        'cpp/application/connect.h',
-        'cpp/application/interface_factory.h',
-        'cpp/application/interface_factory_impl.h',
-        'cpp/application/lib/application_connection.cc',
-        'cpp/application/lib/application_delegate.cc',
-        'cpp/application/lib/application_impl.cc',
-        'cpp/application/lib/service_provider_impl.cc',
-        'cpp/application/lib/service_connector.cc',
-        'cpp/application/lib/service_connector.h',
-        'cpp/application/lib/service_registry.cc',
-        'cpp/application/lib/service_registry.h',
-        'cpp/application/lib/weak_service_provider.cc',
-        'cpp/application/lib/weak_service_provider.h',
-        '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': [
-        'cpp/application/lib/application_runner.cc',
-        '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': [
-        'c/test_support/test_support.h',
-        'c/test_support/test_support_export.h',
-        # TODO(vtl): Convert this to thunks http://crbug.com/386799
-        'tests/test_support_private.cc',
-        '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': [
-        'cpp/test_support/lib/test_support.cc',
-        'cpp/test_support/lib/test_utils.cc',
-        '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': [
-        'cpp/bindings/tests/validation_test_input_parser.cc',
-        'cpp/bindings/tests/validation_test_input_parser.h',
-      ],
-    },
-    {
-      'target_name': 'mojo_public_test_interfaces_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'interfaces/bindings/tests/math_calculator.mojom',
-          'interfaces/bindings/tests/no_module.mojom',
-          'interfaces/bindings/tests/rect.mojom',
-          'interfaces/bindings/tests/regression_tests.mojom',
-          'interfaces/bindings/tests/regression_tests_import.mojom',
-          'interfaces/bindings/tests/sample_factory.mojom',
-          'interfaces/bindings/tests/sample_import.mojom',
-          'interfaces/bindings/tests/sample_import2.mojom',
-          'interfaces/bindings/tests/sample_interfaces.mojom',
-          'interfaces/bindings/tests/sample_service.mojom',
-          'interfaces/bindings/tests/serialization_test_structs.mojom',
-          'interfaces/bindings/tests/test_structs.mojom',
-          'interfaces/bindings/tests/validation_test_interfaces.mojom',
-        ],
-      },
-      'includes': [ 'tools/bindings/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': 'java/system',
-          },
-          'includes': [ '../../build/java.gypi' ],
-        },
-        {
-        # GN version: //mojo/public/java_bindings
-          'target_name': 'mojo_bindings_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'java/bindings',
-           },
-           'dependencies': [
-             'mojo_public_java',
-           ],
-           'includes': [ '../../build/java.gypi' ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index 7e1cdf1..2bebf2e 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -16,7 +16,7 @@
       'sources': [
         'webui/keyboard.mojom',
       ],
-      'includes': [ '../../mojo/public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
     },
     {
       # GN version: //ui/keyboard:resources
@@ -62,10 +62,10 @@
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../content/content.gyp:content_browser',
         '../../ipc/ipc.gyp:ipc',
-        '../../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
-        '../../mojo/public/mojo_public.gyp:mojo_js_bindings',
+        '../../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../mojo/mojo_public.gyp:mojo_js_bindings',
         '../../skia/skia.gyp:skia',
         '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
author	rockot <rockot@chromium.org>	2014-12-16 10:48:54 -0800
committer	Commit bot <commit-bot@chromium.org>	2014-12-16 18:49:16 +0000
commit	829dc9ae81e2ad2f6b890dde15cbe2fc299bc711 (patch)
tree	e6efa5fc37e4da6499ec84aa54997b83fb2a90f5
parent	7e9b46ebc6c08d327da7a9c1047602a6ec720d23 (diff)
download	chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.zip chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.gz chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.bz2