diff options
| author | teravest <teravest@chromium.org> | 2015-02-05 07:25:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 15:26:14 +0000 |
| commit | 8802d7dd2d30ca90dc834089cb871c5f68b76343 (patch) | |
| tree | ba1e2528a536c93b2279ffb20914b7686b31968b /mojo | |
| parent | 7353831d9f7e37f9348cb7c2af601df1000b8b8b (diff) | |
| download | chromium_src-8802d7dd2d30ca90dc834089cb871c5f68b76343.zip chromium_src-8802d7dd2d30ca90dc834089cb871c5f68b76343.tar.gz chromium_src-8802d7dd2d30ca90dc834089cb871c5f68b76343.tar.bz2 | |
Mojo+NaCl: Move generated code to mojo/nacl.
This change moves generated code for Mojo support in NaCl from mojo/monacl to
mojo/nacl. This makes the target directory more consistent across GYP and GN
builds.
An upcoming change for IRT support will generate a header, which will need a
consistent path (relative to include_dirs) across build systems.
An earlier version of this change failed to update
mojo/mojo_nacl_untrusted.gyp, causing clean builds to fail. I've confirmed
that this change builds correctly with a clean build.
BUG=454466
TEST=clobber, then build
Review URL: https://codereview.chromium.org/881933004
Cr-Commit-Position: refs/heads/master@{#314811}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_nacl.gyp | 4 | ||||
| -rw-r--r-- | mojo/mojo_nacl.gypi | 9 | ||||
| -rw-r--r-- | mojo/mojo_nacl_untrusted.gyp | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/mojo/mojo_nacl.gyp b/mojo/mojo_nacl.gyp index 0215be4..e49a26c 100644 --- a/mojo/mojo_nacl.gyp +++ b/mojo/mojo_nacl.gyp @@ -5,11 +5,9 @@ { 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { - 'variables': { - 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl', - }, 'includes': [ '../components/nacl/nacl_defines.gypi', + '../mojo/mojo_nacl.gypi', ], 'targets': [ { diff --git a/mojo/mojo_nacl.gypi b/mojo/mojo_nacl.gypi new file mode 100644 index 0000000..01cfc21 --- /dev/null +++ b/mojo/mojo_nacl.gypi @@ -0,0 +1,9 @@ +# 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. + +{ + 'variables': { + 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/nacl', + }, +} diff --git a/mojo/mojo_nacl_untrusted.gyp b/mojo/mojo_nacl_untrusted.gyp index 859c570..39b237c 100644 --- a/mojo/mojo_nacl_untrusted.gyp +++ b/mojo/mojo_nacl_untrusted.gyp @@ -5,12 +5,10 @@ { 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { - 'variables': { - 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl', - }, 'includes': [ '../build/common_untrusted.gypi', '../components/nacl/nacl_defines.gypi', + '../mojo/mojo_nacl.gypi', '../third_party/mojo/mojo_variables.gypi', ], 'targets': [ |