Chromium Code Reviews| Index: build/all.gyp |
| diff --git a/build/all.gyp b/build/all.gyp |
| index 1866c2efdb51ebc5bfe10929bb6743a1fa8b4e62..46d7de930d2f568042f0e67d493c3b2b2e5b45e2 100644 |
| --- a/build/all.gyp |
| +++ b/build/all.gyp |
| @@ -79,6 +79,7 @@ |
| # the sync-related code for Android has been upstreamed. |
| # See http://crbug.com/159203 |
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', |
| + '../third_party/errorprone/errorprone.gyp:chromium_errorprone', |
|
jbudorick
2015/05/07 18:49:26
Same deal: I'm not sure this needs to be in here.
raywilliams_chromium
2015/05/11 19:52:24
Done.
raywilliams_chromium
2015/05/11 19:52:24
I'll take this out and see what happens :)
|
| ], |
| 'conditions': [ |
| ['chromecast==0', { |
| @@ -319,7 +320,6 @@ |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/display/display.gyp:display_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../url/url.gyp:url_unittests', |
| ], |
| 'conditions': [ |
| @@ -861,7 +861,6 @@ |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', |
| '../ui/events/events.gyp:events_unittests_apk', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', |
| - '../ui/gl/gl_tests.gyp:gl_unittests_apk', |
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_apk', |
| ], |
| 'conditions': [ |
| @@ -954,7 +953,6 @@ |
| '../tools/telemetry/telemetry.gyp:*', |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../url/url.gyp:url_unittests', |
| ], |
| }, |
| @@ -994,7 +992,6 @@ |
| '../tools/telemetry/telemetry.gyp:*', |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../url/url.gyp:url_unittests', |
| ], |
| }, |
| @@ -1046,7 +1043,6 @@ |
| '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../url/url.gyp:url_unittests', |
| ], |
| }, |
| @@ -1101,7 +1097,6 @@ |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/events/events.gyp:events_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', |
| '../ui/views/views.gyp:views_unittests', |
| '../url/url.gyp:url_unittests', |
| @@ -1206,7 +1201,6 @@ |
| '../ui/display/display.gyp:display_unittests', |
| '../ui/events/events.gyp:events_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../ui/keyboard/keyboard.gyp:keyboard_unittests', |
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', |
| '../url/url.gyp:url_unittests', |
| @@ -1262,7 +1256,6 @@ |
| '../sync/sync.gyp:sync_unit_tests', |
| '../ui/base/ui_base_tests.gyp:ui_base_unittests', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', |
| '../ui/views/views.gyp:views_unittests', |
| '../url/url.gyp:url_unittests', |
| @@ -1296,7 +1289,6 @@ |
| '../ui/display/display.gyp:display_unittests', |
| '../ui/events/events.gyp:*', |
| '../ui/gfx/gfx_tests.gyp:gfx_unittests', |
| - '../ui/gl/gl_tests.gyp:gl_unittests', |
| '../ui/keyboard/keyboard.gyp:*', |
| '../ui/snapshot/snapshot.gyp:snapshot_unittests', |
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests', |