summaryrefslogtreecommitdiffstats
path: root/device/vibration
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2014-12-16 10:48:54 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-16 18:49:16 +0000
commit829dc9ae81e2ad2f6b890dde15cbe2fc299bc711 (patch)
treee6efa5fc37e4da6499ec84aa54997b83fb2a90f5 /device/vibration
parent7e9b46ebc6c08d327da7a9c1047602a6ec720d23 (diff)
downloadchromium_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/vibration')
-rw-r--r--device/vibration/vibration.gyp6
1 files changed, 3 insertions, 3 deletions
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': [