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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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 | « no previous file | content/content_renderer.gypi » ('j') | content/public/common/assert_matching_enums.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 5f22b68810222e00ed2f44688b384a6fc5111fa0..6594dd02f15eccc9b16713cfdb7fc1303fa9d2a8 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -71,6 +71,7 @@
'../third_party/re2/re2.gyp:re2',
'../chrome/chrome.gyp:*',
'../cc/cc_tests.gyp:*',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:*',
'../device/bluetooth/bluetooth.gyp:*',
'../device/device_tests.gyp:*',
'../device/usb/usb.gyp:*',
@@ -108,7 +109,6 @@
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
'../v8/tools/gyp/v8.gyp:*',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:*',
'<(libjpeg_gyp_path):*',
],
}],
@@ -278,6 +278,7 @@
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests',
'../device/device_tests.gyp:device_unittests',
'../extensions/extensions.gyp:extensions_unittests',
'../gin/gin.gyp:gin_unittests',
@@ -296,7 +297,6 @@
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/telemetry/telemetry.gyp:*',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
],
}],
['OS=="win"', {
@@ -764,6 +764,7 @@
'../content/content_shell_and_tests.gyp:content_gl_tests_apk',
'../content/content_shell_and_tests.gyp:content_unittests_apk',
'../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests_apk'
'../gpu/gpu.gyp:gl_tests_apk',
'../gpu/gpu.gyp:gpu_unittests_apk',
'../ipc/ipc.gyp:ipc_tests_apk',
@@ -775,7 +776,6 @@
'../ui/events/events.gyp:events_unittests_apk',
'../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
'../ui/ui_unittests.gyp:ui_unittests_apk',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
],
},
{
@@ -837,6 +837,7 @@
'../components/components_tests.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests',
'../device/device_tests.gyp:device_unittests',
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
'../gpu/gpu.gyp:gpu_unittests',
@@ -857,7 +858,6 @@
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
],
},
{
@@ -873,6 +873,7 @@
'../components/components_tests.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests',
'../device/device_tests.gyp:device_unittests',
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
'../gpu/gpu.gyp:gpu_unittests',
@@ -892,7 +893,6 @@
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
],
},
{
@@ -966,6 +966,7 @@
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:copy_test_netscape_plugin',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests',
# ../chrome/test/mini_installer requires mini_installer.
'../chrome/installer/mini_installer.gyp:mini_installer',
'../courgette/courgette.gyp:courgette_unittests',
@@ -990,7 +991,6 @@
'../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
],
'conditions': [
['target_arch=="ia32"', {
@@ -1127,6 +1127,7 @@
'../components/components_tests.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
+ '../content/renderer/compositor_bindings/compositor_bindings_tests.gyp:content_compositor_bindings_unittests',
'../device/device_tests.gyp:device_unittests',
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
@@ -1145,7 +1146,6 @@
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_unittests',
'../ui/wm/wm.gyp:*',
- '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'blink_tests',
],
'conditions': [
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | content/public/common/assert_matching_enums.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698