Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index 882690a258e47a22227b8defcd6095e0e281cc2b..d12c5c7ed12e1a5464191938118b7d40e512bcec 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -178,25 +178,18 @@ group("both_gn_and_gyp") { |
"//media/midi:midi_unittests", |
"//mojo", |
"//mojo/common:mojo_common_unittests", |
+ "//mojo/edk/system:mojo_system_unittests", |
+ "//mojo/edk/test:mojo_public_bindings_unittests", |
+ "//mojo/edk/test:mojo_public_environment_unittests", |
+ "//mojo/edk/test:mojo_public_system_unittests", |
+ "//mojo/edk/test:mojo_public_utility_unittests", |
"//mojo/shell/public/cpp", |
"//net:net_perftests", |
- |
- # TODO(use-new-edk): |
- #"//mojo/edk/system:mojo_system_unittests", |
- #"//mojo/edk/test:mojo_public_bindings_unittests", |
- #"//mojo/edk/test:mojo_public_environment_unittests", |
- #"//mojo/edk/test:mojo_public_system_unittests", |
- #"//mojo/edk/test:mojo_public_utility_unittests", |
"//third_party/WebKit/Source/platform:blink_heap_unittests", |
"//third_party/WebKit/Source/platform:blink_platform_unittests", |
"//third_party/WebKit/Source/web:webkit_unit_tests", |
"//third_party/WebKit/Source/wtf:wtf_unittests", |
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)", |
- "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", |
- "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests", |
- "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests", |
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", |
- "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", |
"//third_party/smhasher:pmurhash", |
"//tools/imagediff($host_toolchain)", |
"//ui/display:display_unittests", |
@@ -499,13 +492,10 @@ group("both_gn_and_gyp") { |
# TODO(GYP): Remove this when the gles2 tests work |
"//gpu/command_buffer/client:gles2_implementation_no_check", |
"//gpu/khronos_glcts_support:khronos_glcts_test", # TODO(GYP) crbug.com/471903 to make this complete. |
+ "//mojo/edk/test:mojo_public_system_perftests", |
"//mojo/shell/public/cpp", |
"//testing/gmock:gmock_main", |
- |
- # TODO(use-new-edk): |
- #"//mojo/edk/test:mojo_public_system_perftests", |
"//third_party/codesighs:nm2tsv", |
- "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests", |
] |
if (!is_android) { |
@@ -764,9 +754,6 @@ group("gn_mojo_targets") { |
"//media/mojo:tests", |
"//media/mojo/services:cdm_service", |
"//mojo:tests", |
- |
- # TODO(use-new-edk): |
- #"//mojo/edk/js/tests:js_to_cpp_bindings_python", |
] |
} |
} |