diff options
| author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
| commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
| tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/edk/mojo_edk.gni | |
| parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
| download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 | |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/edk/mojo_edk.gni')
| -rw-r--r-- | mojo/edk/mojo_edk.gni | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/mojo/edk/mojo_edk.gni b/mojo/edk/mojo_edk.gni deleted file mode 100644 index 1d1d992..0000000 --- a/mojo/edk/mojo_edk.gni +++ /dev/null @@ -1,95 +0,0 @@ -# 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. - -import("../public/mojo_sdk.gni") - -# A mojo_edk_source_set is a mojo_sdk_source_set that does not restrict -# external dependencies and understands the following additional variables, all -# of which admit a list of the relevant elements specified relative to the -# location of the Mojo EDK: -# mojo_edk_configs -# allow_circular_mojo_edk_includes_from -# mojo_edk_public_deps -# mojo_edk_deps - -# Note that it is assumed that the Mojo EDK is a sibling of the Mojo SDK in a -# client repo; the distinctions made above are for the sake of clarity in -# writing targets. -template("mojo_edk_source_set") { - mojo_sdk_source_set(target_name) { - restrict_external_deps = false - - if (defined(invoker.visibility)) { - visibility = invoker.visibility - } - if (defined(invoker.mojo_edk_visibility)) { - mojo_sdk_visibility = invoker.mojo_edk_visibility - } - if (defined(invoker.testonly)) { - testonly = invoker.testonly - } - if (defined(invoker.sources)) { - sources = invoker.sources - } - if (defined(invoker.defines)) { - defines = invoker.defines - } - if (defined(invoker.public_configs)) { - public_configs = invoker.public_configs - } - - configs = [] - if (defined(invoker.configs)) { - configs = invoker.configs - } - if (defined(invoker.mojo_edk_configs)) { - foreach(edk_config, invoker.mojo_edk_configs) { - # Check that the EDK config was not mistakenly given as an absolute - # path. - assert(get_path_info(edk_config, "abspath") != edk_config) - configs += [ rebase_path(edk_config, ".", mojo_root) ] - } - } - - allow_circular_includes_from = [] - if (defined(invoker.allow_circular_includes_from)) { - allow_circular_includes_from += invoker.allow_circular_includes_from - } - if (defined(invoker.allow_circular_mojo_edk_includes_from)) { - foreach(edk_target, invoker.allow_circular_mojo_edk_includes_from) { - # Check that the EDK target was not mistakenly given as an absolute - # path. - assert(get_path_info(edk_target, "abspath") != edk_target) - allow_circular_includes_from += - [ rebase_path(edk_target, ".", mojo_root) ] - } - } - - if (defined(invoker.public_deps)) { - public_deps = invoker.public_deps - } - mojo_sdk_public_deps = [] - if (defined(invoker.mojo_edk_public_deps)) { - # The EDK is required to be a sibling of the SDK, so the relative - # dependencies are rewritten in the same way. - mojo_sdk_public_deps = invoker.mojo_edk_public_deps - } - if (defined(invoker.mojo_sdk_public_deps)) { - mojo_sdk_public_deps += invoker.mojo_sdk_public_deps - } - - if (defined(invoker.deps)) { - deps = invoker.deps - } - mojo_sdk_deps = [] - if (defined(invoker.mojo_edk_deps)) { - # The EDK is required to be a sibling of the SDK, so the relative - # dependencies are rewritten in the same way. - mojo_sdk_deps = invoker.mojo_edk_deps - } - if (defined(invoker.mojo_sdk_deps)) { - mojo_sdk_deps += invoker.mojo_sdk_deps - } - } -} |