diff options
| author | jamesr <jamesr@chromium.org> | 2014-10-02 21:26:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 04:27:07 +0000 |
| commit | a03ae49d253d7d1f517e2f92146a6ba201c78aa6 (patch) | |
| tree | df4eae1239d49490fa4e85d184b9000224a7a31c /mojo/apps/js | |
| parent | 24b9789375c3c23d0d10e5197c6a7674946ea44b (diff) | |
| download | chromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.zip chromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.tar.gz chromium_src-a03ae49d253d7d1f517e2f92146a6ba201c78aa6.tar.bz2 | |
Move mojo edk into mojo/edk
This creates a mojo/edk directory which contains the "embedder developer
kit" aka the set of code needed to embed mojo code.
mojo/edk/embedder = code from mojo/embedder
mojo/edk/system = code from mojo/system
mojo/edk/test = code used to test the previous two, from mojo/common/test
mojo/edk/ can only depend on mojo/public/, base/ and itself.
R=viettrungluu@chromium.org
TBR=sky@chromium.org for file renames
Committed: https://chromium.googlesource.com/chromium/src/+/ee7ff197a98da4636f33bd713de784948b487bd4
Review URL: https://codereview.chromium.org/621153003
Cr-Commit-Position: refs/heads/master@{#297986}
Diffstat (limited to 'mojo/apps/js')
| -rw-r--r-- | mojo/apps/js/test/BUILD.gn | 2 | ||||
| -rw-r--r-- | mojo/apps/js/test/js_to_cpp_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mojo/apps/js/test/BUILD.gn b/mojo/apps/js/test/BUILD.gn index 9044010..2b09e71 100644 --- a/mojo/apps/js/test/BUILD.gn +++ b/mojo/apps/js/test/BUILD.gn @@ -12,7 +12,7 @@ test("mojo_apps_js_unittests") { "//mojo/apps/js", "//mojo/common", "//mojo/common/test:run_all_unittests", - "//mojo/common/test:test_support", + "//mojo/edk/test:test_support", "//mojo/public/interfaces/bindings/tests:test_interfaces", ] diff --git a/mojo/apps/js/test/js_to_cpp_unittest.cc b/mojo/apps/js/test/js_to_cpp_unittest.cc index 76c357b..44526a4 100644 --- a/mojo/apps/js/test/js_to_cpp_unittest.cc +++ b/mojo/apps/js/test/js_to_cpp_unittest.cc @@ -14,7 +14,7 @@ #include "mojo/apps/js/mojo_runner_delegate.h" #include "mojo/apps/js/test/js_to_cpp.mojom.h" #include "mojo/common/common_type_converters.h" -#include "mojo/common/test/test_utils.h" +#include "mojo/edk/test/test_utils.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" |