diff options
| author | rockot <rockot@chromium.org> | 2016-02-10 01:57:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 09:58:42 +0000 |
| commit | c637caf9bac4b86535f19765ae91be2bc8467925 (patch) | |
| tree | 550308031b8ecc3ce3cafb00e4f5d82b34b3c3f9 /extensions/shell | |
| parent | 4104d6998090894fca07949ef4d5d001c19ba051 (diff) | |
| download | chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.zip chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.gz chromium_src-c637caf9bac4b86535f19765ae91be2bc8467925.tar.bz2 | |
[mojo] Delete third_party/mojo
All users are on the new EDK now. This wipes out third_party/mojo,
updates all dependencies, and removes the use-new-edk flag.
BUG=None
Review URL: https://codereview.chromium.org/1676913002
Cr-Commit-Position: refs/heads/master@{#374631}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/BUILD.gn | 2 | ||||
| -rw-r--r-- | extensions/shell/app_shell.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn index a98d704..c2f57e9 100644 --- a/extensions/shell/BUILD.gn +++ b/extensions/shell/BUILD.gn @@ -54,10 +54,10 @@ source_set("app_shell_lib") { "//extensions/shell/common/api", "//extensions/shell/common/api:api_registration", "//extensions/utility", + "//mojo/edk/system", "//mojo/environment:chromium", "//skia", "//third_party/WebKit/public:blink", - "//third_party/mojo/src/mojo/edk/system", "//ui/base", "//ui/base/ime", "//v8", diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index 695bb32..9d085db 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -47,9 +47,9 @@ '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration', '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api', '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium', + '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', - '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl', '<(DEPTH)/ui/base/ime/ui_base_ime.gyp:ui_base_ime', '<(DEPTH)/ui/base/ui_base.gyp:ui_base', '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |