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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/mojo/mojo_edk_tests.gyp

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
« chrome/browser/chromeos/BUILD.gn ('K') | « third_party/mojo/mojo_edk.gyp ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/mojo_edk_tests.gyp
diff --git a/third_party/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp
index aee91375c0c37517a08f6ec1750a2ba719b8fd53..c4d634240bb41f5d244afc4986758d77f2d10a3c 100644
--- a/third_party/mojo/mojo_edk_tests.gyp
+++ b/third_party/mojo/mojo_edk_tests.gyp
@@ -4,7 +4,7 @@
{
'includes': [
- 'mojo_variables.gypi',
+ '../../mojo/mojo_variables.gypi',
],
'targets': [
{
@@ -36,34 +36,34 @@
'dependencies': [
'../../mojo/mojo_base.gyp:mojo_environment_chromium',
'../../mojo/mojo_base.gyp:mojo_message_pump_lib',
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_public.gyp:mojo_public_bindings_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_public_test_interfaces',
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_public.gyp:mojo_cpp_bindings',
- 'mojo_public.gyp:mojo_public_bindings_test_utils',
- 'mojo_public.gyp:mojo_public_test_interfaces',
- 'mojo_public.gyp:mojo_public_test_utils',
- 'mojo_public.gyp:mojo_utility',
],
'sources': [
- 'src/mojo/public/cpp/bindings/tests/array_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/buffer_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/connector_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/container_test_util.cc',
- 'src/mojo/public/cpp/bindings/tests/equals_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/map_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/message_queue.cc',
- 'src/mojo/public/cpp/bindings/tests/message_queue.h',
- 'src/mojo/public/cpp/bindings/tests/request_response_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/router_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/string_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/struct_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
- 'src/mojo/public/cpp/bindings/tests/validation_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/array_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/buffer_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/connector_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/container_test_util.cc',
+ '../../mojo/public/cpp/bindings/tests/equals_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/map_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/message_queue.cc',
+ '../../mojo/public/cpp/bindings/tests/message_queue.h',
+ '../../mojo/public/cpp/bindings/tests/request_response_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/router_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/string_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/struct_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
+ '../../mojo/public/cpp/bindings/tests/validation_unittest.cc',
],
},
{
@@ -71,17 +71,17 @@
'target_name': 'mojo_public_bindings_perftests',
'type': 'executable',
'dependencies': [
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_public.gyp:mojo_environment_standalone',
+ '../../mojo/mojo_public.gyp:mojo_public_bindings_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_public_test_interfaces',
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_public.gyp:mojo_cpp_bindings',
- 'mojo_public.gyp:mojo_environment_standalone',
- 'mojo_public.gyp:mojo_public_bindings_test_utils',
- 'mojo_public.gyp:mojo_public_test_interfaces',
- 'mojo_public.gyp:mojo_public_test_utils',
- 'mojo_public.gyp:mojo_utility',
],
'sources': [
- 'src/mojo/public/cpp/bindings/tests/bindings_perftest.cc',
+ '../../mojo/public/cpp/bindings/tests/bindings_perftest.cc',
],
},
{
@@ -89,19 +89,19 @@
'target_name': 'mojo_public_environment_unittests',
'type': 'executable',
'dependencies': [
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_public.gyp:mojo_environment_standalone',
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_public.gyp:mojo_cpp_bindings',
- 'mojo_public.gyp:mojo_environment_standalone',
- 'mojo_public.gyp:mojo_public_test_utils',
- 'mojo_public.gyp:mojo_utility',
],
'include_dirs': [ '../..' ],
'sources': [
- 'src/mojo/public/cpp/environment/tests/async_wait_unittest.cc',
- 'src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
- 'src/mojo/public/cpp/environment/tests/logger_unittest.cc',
- 'src/mojo/public/cpp/environment/tests/logging_unittest.cc',
+ '../../mojo/public/cpp/environment/tests/async_wait_unittest.cc',
+ '../../mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
+ '../../mojo/public/cpp/environment/tests/logger_unittest.cc',
+ '../../mojo/public/cpp/environment/tests/logging_unittest.cc',
],
},
{
@@ -110,9 +110,9 @@
'target_name': 'mojo_public_system_unittests',
'type': 'executable',
'dependencies': [
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_public.gyp:mojo_public_test_utils',
],
'include_dirs': [ '../..' ],
'sources': [
@@ -124,24 +124,24 @@
'target_name': 'mojo_public_utility_unittests',
'type': 'executable',
'dependencies': [
+ '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_unittests',
- 'mojo_public.gyp:mojo_cpp_bindings',
- 'mojo_public.gyp:mojo_public_test_utils',
- 'mojo_public.gyp:mojo_utility',
],
'include_dirs': [ '../..' ],
'sources': [
- 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
- 'src/mojo/public/cpp/utility/tests/run_loop_unittest.cc',
- 'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
+ '../../mojo/public/cpp/utility/tests/mutex_unittest.cc',
+ '../../mojo/public/cpp/utility/tests/run_loop_unittest.cc',
+ '../../mojo/public/cpp/utility/tests/thread_unittest.cc',
],
'conditions': [
# See crbug.com/342893:
['OS=="win"', {
'sources!': [
- 'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
- 'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
+ '../../mojo/public/cpp/utility/tests/mutex_unittest.cc',
+ '../../mojo/public/cpp/utility/tests/thread_unittest.cc',
],
}],
],
@@ -152,13 +152,13 @@
'type': 'executable',
'dependencies': [
'../../base/base.gyp:base',
+ '../../mojo/mojo_public.gyp:mojo_public_test_utils',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'../../testing/gtest.gyp:gtest',
'mojo_edk.gyp:mojo_run_all_perftests',
- 'mojo_public.gyp:mojo_public_test_utils',
- 'mojo_public.gyp:mojo_utility',
],
'sources': [
- 'src/mojo/public/c/system/tests/core_perftest.cc',
+ '../../mojo/public/c/system/tests/core_perftest.cc',
],
},
{
@@ -256,12 +256,12 @@
'type': 'executable',
'dependencies': [
'../../gin/gin.gyp:gin_test',
+ '../../mojo/mojo_public.gyp:mojo_environment_standalone',
+ '../../mojo/mojo_public.gyp:mojo_public_test_interfaces',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'mojo_edk.gyp:mojo_common_test_support',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_edk.gyp:mojo_js_lib',
- 'mojo_public.gyp:mojo_environment_standalone',
- 'mojo_public.gyp:mojo_public_test_interfaces',
- 'mojo_public.gyp:mojo_utility',
],
'sources': [
'src/mojo/edk/js/handle_unittest.cc',
@@ -275,9 +275,9 @@
'dependencies': [
'../../base/base.gyp:base',
'../../gin/gin.gyp:gin_test',
- 'mojo_public.gyp:mojo_environment_standalone',
- 'mojo_public.gyp:mojo_public_test_interfaces',
- 'mojo_public.gyp:mojo_utility',
+ '../../mojo/mojo_public.gyp:mojo_environment_standalone',
+ '../../mojo/mojo_public.gyp:mojo_public_test_interfaces',
+ '../../mojo/mojo_public.gyp:mojo_utility',
'mojo_edk.gyp:mojo_js_lib',
'mojo_edk.gyp:mojo_run_all_unittests',
'mojo_js_to_cpp_bindings',
@@ -295,7 +295,7 @@
'src/mojo/edk/js/tests/js_to_cpp.mojom',
],
},
- 'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+ 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ],
},
],
'conditions': [
« chrome/browser/chromeos/BUILD.gn ('K') | « third_party/mojo/mojo_edk.gyp ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698