diff options
| author | brettw <brettw@chromium.org> | 2015-10-20 20:05:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 03:06:32 +0000 |
| commit | 011138d7e02ee1c345fa55805ca2c154ca68c1bf (patch) | |
| tree | 71b08f4e1693085f81b37f7f35b0e6b43df05d01 /BUILD.gn | |
| parent | 4c50dbb58688047efbe6b8b86cfb97ee64b7d97a (diff) | |
| download | chromium_src-011138d7e02ee1c345fa55805ca2c154ca68c1bf.zip chromium_src-011138d7e02ee1c345fa55805ca2c154ca68c1bf.tar.gz chromium_src-011138d7e02ee1c345fa55805ca2c154ca68c1bf.tar.bz2 | |
Add more test binaries to GN Mac build.
This adds components_unittests (passes) and components_browsertests (fails with some bundle-related errors).
osmesa should be a loadable_module on Mac. I removed the "lib" prefix from loadable modules on Mac as GYP calls is just "osmesa.so".
Removes a GYP warning exclusion for libaddressinput because Grit no longer generates a file ending with no newline.
Made device's weak_framework parameter two arguments rather than one with a space. GN will escape the space to keep everything together, and this confuses clang.
Review URL: https://codereview.chromium.org/1415783003
Cr-Commit-Position: refs/heads/master@{#355228}
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -534,20 +534,13 @@ group("both_gn_and_gyp") { "//chrome/test:interactive_ui_tests", # TODO(GYP) "//chrome/test:sync_integration_tests", # TODO(GYP) "//chrome/test:unit_tests", # TODO(GYP) - "//components:components_browsertests", # TODO(GYP) - "//components:components_unittests", # TODO(GYP) "//content/test:content_browsertests", # TODO(GYP) "//content/test:content_perftests", # TODO(GYP) - "//device:device_unittests", # TODO(GYP) - "//extensions:extensions_browsertests", # TODO(GYP) - "//extensions:extensions_unittests", # TODO(GYP) - "//mojo", # TODO(GYP) - "//mojo/application/public/cpp", # TODO(GYP) + "//extensions:extensions_browsertests", # TODO(GYP) Needs ContentMain - # TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac. - "//third_party/WebKit/Source/platform:heap_unittests", - "//third_party/WebKit/Source/platform:platform_unittests", - "//third_party/WebKit/Source/web:webkit_unit_tests", + # Mojo in GN contains some things which are never compiled in GYP on Mac, + # so compilation fails on Mac. They need porting. + "//mojo", # TODO(GYP) ] } |