| Index: mojo/BUILD.gn
|
| diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
|
| index 2bb0214fecd4eb1585489d46ecb23772f78077ee..1ba9399b26fe5108550955d26fa6cd481bfad4d1 100644
|
| --- a/mojo/BUILD.gn
|
| +++ b/mojo/BUILD.gn
|
| @@ -27,36 +27,51 @@ group("mojo") {
|
| # The _run targets exist only for compatibility w/ GYP.
|
| group("mojo_public_bindings_unittests_run") {
|
| testonly = true
|
| - deps = [
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
|
| - ]
|
| + deps = []
|
| + if (use_chrome_edk) {
|
| + deps += [ "//mojo/edk/test:mojo_public_bindings_unittests" ]
|
| + } else {
|
| + deps += [ "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests" ]
|
| + }
|
| }
|
|
|
| # TODO(GYP): Delete this after we've converted everything to GN.
|
| # The _run targets exist only for compatibility w/ GYP.
|
| group("mojo_public_environment_unittests_run") {
|
| testonly = true
|
| - deps = [
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
|
| - ]
|
| + deps = []
|
| + if (use_chrome_edk) {
|
| + deps += [ "//mojo/edk/test:mojo_public_bindings_unittests" ]
|
| + } else {
|
| + deps += [ "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests" ]
|
| + }
|
| }
|
|
|
| # TODO(GYP): Delete this after we've converted everything to GN.
|
| # The _run targets exist only for compatibility w/ GYP.
|
| group("mojo_public_system_unittests_run") {
|
| testonly = true
|
| - deps = [
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
|
| - ]
|
| +
|
| + deps = []
|
| + if (use_chrome_edk) {
|
| + deps += [ "//mojo/edk/test:mojo_public_system_unittests" ]
|
| + } else {
|
| + deps +=
|
| + [ "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests" ]
|
| + }
|
| }
|
|
|
| # TODO(GYP): Delete this after we've converted everything to GN.
|
| # The _run targets exist only for compatibility w/ GYP.
|
| group("mojo_public_utility_unittests_run") {
|
| testonly = true
|
| - deps = [
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
|
| - ]
|
| + deps = []
|
| + if (use_chrome_edk) {
|
| + deps += [ "//mojo/edk/test:mojo_public_utility_unittests" ]
|
| + } else {
|
| + deps +=
|
| + [ "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests" ]
|
| + }
|
| }
|
|
|
| group("tests") {
|
| @@ -66,16 +81,32 @@ group("tests") {
|
| "//mojo/application/public/cpp/tests:mojo_public_application_unittests",
|
| "//mojo/common:mojo_common_unittests",
|
| "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
|
| - "//third_party/mojo/src/mojo/edk/js/test:js_unittests",
|
| - "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests",
|
| - "//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_perftests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
|
| ]
|
|
|
| + if (use_chrome_edk) {
|
| + deps += [
|
| + "//mojo/edk/js/test:js_unittests",
|
| + "//mojo/edk/system:mojo_message_pipe_perftests",
|
| + "//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_perftests",
|
| + "//mojo/edk/test:mojo_public_system_unittests",
|
| + "//mojo/edk/test:mojo_public_utility_unittests",
|
| + ]
|
| + } else {
|
| + deps += [
|
| + "//third_party/mojo/src/mojo/edk/js/test:js_unittests",
|
| + "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests",
|
| + "//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_perftests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
|
| + ]
|
| + }
|
| +
|
| if (!is_component_build) {
|
| deps += [
|
| "//mojo/runner:apptests",
|
|
|