diff options
| 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 /device | |
| parent | 7e9b46ebc6c08d327da7a9c1047602a6ec720d23 (diff) | |
| download | chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.zip chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.gz chromium_src-829dc9ae81e2ad2f6b890dde15cbe2fc299bc711.tar.bz2 | |
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}
Diffstat (limited to 'device')
| -rw-r--r-- | device/battery/battery.gyp | 6 | ||||
| -rw-r--r-- | device/device_tests.gyp | 4 | ||||
| -rw-r--r-- | device/serial/serial.gyp | 6 | ||||
| -rw-r--r-- | device/vibration/vibration.gyp | 6 |
4 files changed, 11 insertions, 11 deletions
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': [ |