Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: content/test/BUILD.gn

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/android/BUILD.gn ('k') | content/utility/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 5a3591590a63f143329551e7a657a585a2537103..a24b0a5d6f974399a83f7af8ce42348336f0a7e4 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -8,8 +8,8 @@ import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//build_overrides/v8.gni")
import("//media/media_options.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
-import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
content_tests_gypi_values =
exec_script("//build/gypi_to_gn.py",
@@ -348,6 +348,8 @@ test("content_browsertests") {
"//media:shared_memory_support",
"//mojo/application/public/cpp:cpp_for_chromium",
"//mojo/environment:chromium",
+ "//mojo/public/cpp/bindings",
+ "//mojo/public/js",
"//mojo/test:test_support",
"//net:test_support",
"//ppapi/host",
@@ -356,8 +358,6 @@ test("content_browsertests") {
"//ppapi/shared_impl",
"//third_party/mojo/src/mojo/edk/system",
"//third_party/mojo/src/mojo/edk/test:test_support",
- "//third_party/mojo/src/mojo/public/cpp/bindings",
- "//third_party/mojo/src/mojo/public/js",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/public:blink",
@@ -530,6 +530,7 @@ test("content_unittests") {
"//device/battery",
"//device/battery:mojo_bindings",
"//mojo/environment:chromium",
+ "//mojo/public/cpp/bindings",
"//net:extras",
"//net:test_support",
"//skia",
@@ -538,7 +539,6 @@ test("content_unittests") {
"//testing/gmock",
"//testing/gtest",
"//third_party/mojo/src/mojo/edk/test:test_support",
- "//third_party/mojo/src/mojo/public/cpp/bindings",
"//third_party/re2",
"//ui/accessibility",
"//ui/base",
« no previous file with comments | « content/shell/android/BUILD.gn ('k') | content/utility/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698