summaryrefslogtreecommitdiffstats
path: root/mojo/mojo_variables.gypi
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 /mojo/mojo_variables.gypi
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 'mojo/mojo_variables.gypi')
-rw-r--r--mojo/mojo_variables.gypi6
1 files changed, 3 insertions, 3 deletions
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",
}],
],