| Index: third_party/mojo/src/mojo/edk/mojo_edk.gni
|
| diff --git a/third_party/mojo/src/mojo/edk/mojo_edk.gni b/third_party/mojo/src/mojo/edk/mojo_edk.gni
|
| index 21ad315a96af5baa5633da398007f87e850b57f9..fcdb13b24d9afd2293b4e5bc1bf42248c1b11b7c 100644
|
| --- a/third_party/mojo/src/mojo/edk/mojo_edk.gni
|
| +++ b/third_party/mojo/src/mojo/edk/mojo_edk.gni
|
| @@ -2,7 +2,7 @@
|
| # 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")
|
| +import("//mojo/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
|
| @@ -25,9 +25,6 @@ template("mojo_edk_source_set") {
|
| 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
|
| }
|
| @@ -50,7 +47,7 @@ template("mojo_edk_source_set") {
|
| # 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) ]
|
| + configs += [ rebase_path(edk_config, ".", "//third_party/mojo/src") ]
|
| }
|
| }
|
|
|
| @@ -64,7 +61,7 @@ template("mojo_edk_source_set") {
|
| # path.
|
| assert(get_path_info(edk_target, "abspath") != edk_target)
|
| allow_circular_includes_from +=
|
| - [ rebase_path(edk_target, ".", mojo_root) ]
|
| + [ rebase_path(edk_target, ".", "//third_party/mojo/src") ]
|
| }
|
| }
|
|
|
|
|