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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_tests.gypi

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 years, 10 months 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/content_renderer.gypi ('k') | content/content_utility.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9041d2a1597ef09f286fa60047935d2d3e494499..566d2bdba728a827aed8665a25a12e163103f697 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -837,13 +837,13 @@
'dependencies': [
'../mojo/mojo_base.gyp:mojo_application_base',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../storage/storage_common.gyp:storage_common',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../ui/accessibility/accessibility.gyp:ax_gen',
'../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
'../ui/base/ui_base.gyp:ui_base',
@@ -929,6 +929,8 @@
'../media/midi/midi.gyp:midi',
'../mojo/mojo_base.gyp:mojo_application_base',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_edk.gyp:mojo_common_test_support',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -936,8 +938,6 @@
'../storage/storage_browser.gyp:storage',
'../storage/storage_common.gyp:storage_common',
'../third_party/WebKit/public/blink.gyp:blink',
- '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../ui/compositor/compositor.gyp:compositor_test_support',
'../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
@@ -1158,6 +1158,8 @@
'../media/media.gyp:media_test_support',
'../media/media.gyp:shared_memory_support',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_edk.gyp:mojo_common_test_support',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../net/net.gyp:net_extras',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
@@ -1171,8 +1173,6 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle',
- '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../third_party/re2/re2.gyp:re2',
'../third_party/WebKit/public/blink.gyp:blink',
'../ui/accessibility/accessibility.gyp:accessibility',
@@ -1457,21 +1457,21 @@
'sources': [
'public/test/test_mojo_service.mojom',
],
- 'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
+ 'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
},
{
# GN version: //content/test:web_ui_test_mojo_bindings
'target_name': 'web_ui_test_mojo_bindings',
'type': 'static_library',
'dependencies': [
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
],
'sources': [
'test/data/web_ui_test_mojo_bindings.mojom',
],
- 'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
+ 'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
],
},
{
@@ -1504,6 +1504,10 @@
'../mojo/mojo_base.gyp:mojo_application_base',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/mojo_base.gyp:mojo_test_support',
+ '../mojo/mojo_edk.gyp:mojo_common_test_support',
+ '../mojo/mojo_edk.gyp:mojo_system_impl',
+ '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/mojo_public.gyp:mojo_js_bindings',
'../net/net.gyp:net_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
@@ -1515,10 +1519,6 @@
'../third_party/WebKit/public/blink.gyp:blink',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/mesa/mesa.gyp:osmesa',
- '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
- '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
- '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
- '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/accessibility/accessibility.gyp:accessibility',
'../ui/base/ui_base.gyp:ui_base',
@@ -2147,12 +2147,12 @@
'../device/battery/battery.gyp:device_battery_javatests',
'../media/media.gyp:media_java',
'../media/media.gyp:media_test_support',
+ '../mojo/mojo_public.gyp:mojo_public_test_interfaces',
'../net/net.gyp:net_java',
'../net/net.gyp:net_javatests',
'../net/net.gyp:net_java_test_support',
'../testing/android/on_device_instrumentation.gyp:broker_java',
'../testing/android/on_device_instrumentation.gyp:require_driver_apk',
- '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
],
'variables': {
'apk_name': 'ContentShellTest',
« no previous file with comments | « content/content_renderer.gypi ('k') | content/content_utility.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698