diff options
| author | blundell <blundell@chromium.org> | 2015-01-29 09:36:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-29 17:37:14 +0000 |
| commit | 29cbd973babcdcddc9df43f492088fa69795874e (patch) | |
| tree | 022390ea53b2af5e2d8cd0bbe1d45d674ab1de32 /mojo/services/navigation | |
| parent | 931d092bc54acfd92322f4d28a3d1c401f76c181 (diff) | |
| download | chromium_src-29cbd973babcdcddc9df43f492088fa69795874e.zip chromium_src-29cbd973babcdcddc9df43f492088fa69795874e.tar.gz chromium_src-29cbd973babcdcddc9df43f492088fa69795874e.tar.bz2 | |
Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd
Update HTMLViewer for de-clienting of Shell.
Update ServiceRegistryTest.java for de-clienting of MathCalculator.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/883843002
Cr-Commit-Position: refs/heads/master@{#313729}
Diffstat (limited to 'mojo/services/navigation')
| -rw-r--r-- | mojo/services/navigation/public/interfaces/BUILD.gn | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mojo/services/navigation/public/interfaces/BUILD.gn b/mojo/services/navigation/public/interfaces/BUILD.gn index 9b396e7..da9fc70 100644 --- a/mojo/services/navigation/public/interfaces/BUILD.gn +++ b/mojo/services/navigation/public/interfaces/BUILD.gn @@ -12,7 +12,13 @@ mojom("interfaces") { import_dirs = [ get_path_info("../../../", "abspath") ] + if (defined(network_service_root)) { + import_dirs += [ network_service_root ] + } else { + network_service_root = "../../.." + } + deps = [ - "../../../network/public/interfaces", + "$network_service_root/network/public/interfaces", ] } |