Index: build/all.gyp |
diff --git a/build/all.gyp b/build/all.gyp |
index 8ad63b36772eccb279d402dbe82020cb6305bde9..dcee645b42fe97b333cf443cc57634ede215afe5 100644 |
--- a/build/all.gyp |
+++ b/build/all.gyp |
@@ -59,6 +59,7 @@ |
'../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests', |
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests', |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests', |
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', |
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests', |
'../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', |
@@ -229,7 +230,6 @@ |
['use_aura==1', { |
'dependencies': [ |
'../ui/aura/aura.gyp:*', |
- '../ui/aura_extra/aura_extra.gyp:*', |
], |
}], |
['use_ash==1', { |
@@ -276,6 +276,125 @@ |
], |
}, # target_name: All |
{ |
+ 'target_name': 'gyp_all', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ ':gn_all', |
+ '../chrome/chrome.gyp:chromedriver_unittests', |
+ '../components/components_tests.gyp:components_browsertests', |
+ # '../components/nacl.gyp:nacl_loader_unittests', |
+ '../device/device_tests.gyp:device_unittests', |
+ # '../remoting/remoting.gyp:remoting_unittests', |
+ '../ui/compositor/compositor.gyp:compositor_unittests', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gn_all', |
+ 'type': 'none', |
+ |
+ 'dependencies': [ |
+ '../base/base.gyp:base_unittests', |
+ |
+ # TODO(GYP): Verify if this is actually used on Linux (it is built). |
+ # Could just be needed only on android and mac. |
+ '../breakpad/breakpad.gyp:symupload', |
+ |
+ '../cc/cc_tests.gyp:cc_unittests', |
+ '../chrome/chrome.gyp:chrome', |
+ '../chrome/chrome.gyp:browser_tests', |
+ '../chrome/chrome.gyp:interactive_ui_tests', |
+ '../chrome/chrome.gyp:sync_integration_tests', |
+ '../chrome/chrome.gyp:unit_tests', |
+ '../components/components_tests.gyp:components_unittests', |
+ '../content/content_shell_and_tests.gyp:content_shell', |
+ '../content/content_shell_and_tests.gyp:content_browsertests', |
+ '../content/content_shell_and_tests.gyp:content_perftests', |
+ '../content/content_shell_and_tests.gyp:content_unittests', |
+ '../crypto/crypto.gyp:crypto_unittests', |
+ '../extensions/extensions_tests.gyp:extensions_browsertests', |
+ '../extensions/extensions_tests.gyp:extensions_unittests', |
+ '../google_apis/google_apis.gyp:google_apis_unittests', |
+ '../google_apis/gcm/gcm.gyp:gcm_unit_tests', |
+ '../gpu/gpu.gyp:gpu_unittests', |
+ '../ipc/ipc.gyp:ipc_tests', |
+ '../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests', |
+ '../jingle/jingle.gyp:jingle_unittests', |
+ '../media/media.gyp:media_unittests', |
+ '../media/cast/cast.gyp:cast_unittests', |
+ '../mojo/mojo_base.gyp:mojo_common_unittests', |
+ '../net/net.gyp:net_unittests', |
+ '../ppapi/ppapi_internal.gyp:ppapi_tests', |
+ '../printing/printing.gyp:printing_unittests', |
+ '../sql/sql.gyp:sql_unittests', |
+ '../skia/skia_tests.gyp:skia_unittests', |
+ '../sync/sync.gyp:sync_unit_tests', |
+ |
+ # TODO(GYP): the Blink test targets should be public, but |
+ # currently aren't. all_blink puls them in, though |
+ # "//third_party/WebKit/Source/platform:heap_unittests", |
+ # "//third_party/WebKit/Source/platform:platform_unittests", |
+ # "//third_party/WebKit/Source/wtf:wtf_unittests", |
+ '../third_party/WebKit/public/all.gyp:all_blink', |
+ |
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', |
+ |
+ # TODO(GYP): Needed only w/ cld_version==1. What configs set that? |
+ '../third_party/cld/cld.gyp:cld', |
+ |
+ # TODO(GYP): This is needed only w/ use_system_fontconfig==0. What configs set that? |
+ '../third_party/fontconfig/fontconfig.gyp:fontconfig', |
+ |
+ # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. |
+ # For now pull it in manually so that it doesn't regress. |
+ '../third_party/libsrtp/libsrtp.gyp:libsrtp', |
+ |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests', |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests', |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', |
+ '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests', |
+ '../third_party/pdfium/samples/samples.gyp:pdfium_test', |
+ |
+ # TODO(GYP): Verify that this is no longer needed. |
+ '../third_party/smhasher/smhasher.gyp:pmurhash', |
+ |
+ # TODO(GYP): This will be pulled in automatically when enable_webrtc==true. |
+ # For now pull it in manually so that it doesn't regress. |
+ '../third_party/usrsctp/usrsctp.gyp:usrsctplib', |
+ |
+ '../tools/gn/gn.gyp:gn', |
+ '../tools/gn/gn.gyp:gn_unittests', |
+ '../tools/imagediff/image_diff.gyp:image_diff', |
+ '../ui/accessibility/accessibility.gyp:accessibility_unittests', |
+ '../ui/app_list/app_list.gyp:app_list_unittests', |
+ '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
+ '../ui/display/display.gyp:display_unittests', |
+ '../ui/events/events.gyp:events_unittests', |
+ '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
+ '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', |
+ '../ui/views/views.gyp:views_unittests', |
+ '../ui/wm/wm.gyp:wm_unittests', |
+ '../url/url.gyp:url_unittests', |
+ ], |
+ 'conditions': [ |
+ ['OS=="android"', { |
+ 'dependencies': [ |
+ '../chrome/chrome.gyp:chrome_shell_apk', |
+ '../content/content_shell_and_tests.gyp:content_shell_apk', |
+ ], |
+ 'dependencies!': [ |
+ '../url/url.gyp:url_unittests', |
+ ], |
+ }], |
+ ['OS=="linux"', { |
+ 'dependencies': [ |
+ '../dbus/dbus.gyp:dbus_unittests', |
+ '../sandbox/sandbox.gyp:sandbox_linux_unittests', |
+ ], |
+ }], |
+ ], |
+ }, |
+ { |
'target_name': 'All_syzygy', |
'type': 'none', |
'conditions': [ |