| Index: mojo/public/mojo_sdk.gni
|
| diff --git a/third_party/mojo/src/mojo/public/mojo_sdk.gni b/mojo/public/mojo_sdk.gni
|
| similarity index 87%
|
| rename from third_party/mojo/src/mojo/public/mojo_sdk.gni
|
| rename to mojo/public/mojo_sdk.gni
|
| index 598b5b4dabc0e14a916698e321a40e3878a5d15e..3ddba35867ade38d5ca0eea1071080e4e2489f66 100644
|
| --- a/third_party/mojo/src/mojo/public/mojo_sdk.gni
|
| +++ b/mojo/public/mojo_sdk.gni
|
| @@ -2,12 +2,6 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -# The absolute path to the directory containing the mojo public SDK (i.e., the
|
| -# directory containing mojo/public). The build files within the Mojo public
|
| -# SDK use this variable to allow themselves to be parameterized by the location
|
| -# of the public SDK within a client repo.
|
| -mojo_root = get_path_info("../..", "abspath")
|
| -
|
| # Takes as input a "source_set" that includes dependencies that are relative to
|
| # the parent directory of the Mojo public SDK (given in |mojo_sdk_deps|).
|
| # Generates a source_set that has the mojo_sdk_deps added as ordinary deps
|
| @@ -54,7 +48,7 @@ template("mojo_sdk_source_set") {
|
| # Check that the SDK target was not mistakenly given as an absolute
|
| # path.
|
| assert(get_path_info(sdk_target, "abspath") != sdk_target)
|
| - visibility += [ rebase_path(sdk_target, ".", mojo_root) ]
|
| + visibility += [ rebase_path(sdk_target, ".", "//") ]
|
| }
|
| }
|
|
|
| @@ -74,8 +68,7 @@ template("mojo_sdk_source_set") {
|
| libs = invoker.libs
|
| }
|
|
|
| - public_configs =
|
| - [ rebase_path("mojo/public/build/config:mojo_sdk", ".", mojo_root) ]
|
| + public_configs = []
|
| if (defined(invoker.public_configs)) {
|
| public_configs += invoker.public_configs
|
| }
|
| @@ -111,7 +104,7 @@ template("mojo_sdk_source_set") {
|
| foreach(sdk_dep, invoker.mojo_sdk_public_deps) {
|
| # Check that the SDK dep was not mistakenly given as an absolute path.
|
| assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
|
| - public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
|
| + public_deps += [ rebase_path(sdk_dep, ".", "//") ]
|
| }
|
| }
|
|
|
| @@ -134,7 +127,7 @@ template("mojo_sdk_source_set") {
|
| foreach(sdk_dep, invoker.mojo_sdk_deps) {
|
| # Check that the SDK dep was not mistakenly given as an absolute path.
|
| assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
|
| - deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
|
| + deps += [ rebase_path(sdk_dep, ".", "//") ]
|
| }
|
| }
|
|
|
|
|