Skip to content

GitLab

T
tangled
Commit b568f02e authored by abarth's avatar abarth Committed by Commit bot
Browse files
Options

Make it possible to use mojo_variables.gypi at any depth 

Previously, mojo_variables.gypi hard-coded a DEPTH of 1, which meant that only
GYP files that were directly in folders in the root could use it. After this
CL, GYP files at any depth of the tree can use it.

R=jamesr@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#294907}
parent 29b91c05
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
mojo/mojo_variables.gypi
View file @ b568f02e
......@@ -32,13 +32,13 @@
# which Mojo system library they are using.
#
['component=="shared_library"', {
'mojo_system_for_component': "../mojo/mojo_base.gyp:mojo_system_impl",
'mojo_system_for_loadable_module': "../mojo/mojo_base.gyp:mojo_system_impl",
'mojo_gles2_for_component': "../mojo/mojo_base.gyp:mojo_gles2_impl",
'mojo_system_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_system_impl",
'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_base.gyp:mojo_system_impl",
'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl",
}, {
'mojo_system_for_component': "../mojo/mojo_base.gyp:mojo_none",
'mojo_system_for_loadable_module': "../mojo/mojo_base.gyp:mojo_system",
'mojo_gles2_for_component': "../mojo/mojo_base.gyp:mojo_none",
'mojo_system_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_base.gyp:mojo_system",
'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
}],
],
'mojo_public_system_unittest_sources': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment