Skip to content

Commit

Permalink
Mojo EDK -> Core: Misc top-levels
Browse files Browse the repository at this point in the history
Moves all remaining dependencies from mojo/edk to mojo/core, covering the
top-levels that had relatively few dependencies to begin with.

All mechanical changes, hence TBR(s).

[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]

Bug: None
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I4961ea707383e161d4b8f2c0de8341c0010b4485
Reviewed-on: https://chromium-review.googlesource.com/1126418
Commit-Queue: Ken Rockot <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#572665}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f03d97c950d2d58aa7055d3ddcb40ec432bb39a7
  • Loading branch information
krockot authored and Commit Bot committed Jul 4, 2018
1 parent f942be7 commit 8934cbc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ test("url_unittests") {

if (!is_ios) {
deps += [
"//mojo/edk",
"//mojo/core/embedder",
"//url/mojom:test_url_mojom_gurl",
]
}
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ specific_include_rules = {
"+third_party/icu",
],
"run_all_unittests\.cc": [
"+mojo/edk/embedder",
"+mojo/core/embedder",
],
}
4 changes: 2 additions & 2 deletions run_all_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
#include "build/build_config.h"

#if !defined(OS_IOS)
#include "mojo/edk/embedder/embedder.h" // nogncheck
#include "mojo/core/embedder/embedder.h" // nogncheck
#endif

int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);

#if !defined(OS_IOS)
mojo::edk::Init();
mojo::core::Init();
#endif

return base::LaunchUnitTests(
Expand Down

0 comments on commit 8934cbc

Please sign in to comment.