| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index 226eadaa37083e3c0f29a66888f6ef91b2340f62..aa570102ad67c5d70968c55cd7202a432c174f59 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -29,10 +29,8 @@
|
| '../third_party/libxml/libxml.gyp:*',
|
| '../third_party/sqlite/sqlite.gyp:*',
|
| '../third_party/zlib/zlib.gyp:*',
|
| - '../ui/accessibility/accessibility.gyp:*',
|
| '../ui/base/ui_base.gyp:*',
|
| '../ui/display/display.gyp:display_unittests',
|
| - '../ui/snapshot/snapshot.gyp:*',
|
| '../url/url.gyp:*',
|
| ],
|
| 'conditions': [
|
| @@ -230,17 +228,6 @@
|
| '../third_party/libevent/libevent.gyp:*',
|
| ],
|
| }],
|
| - ['toolkit_views==1', {
|
| - 'dependencies': [
|
| - '../ui/views/controls/webview/webview.gyp:*',
|
| - '../ui/views/views.gyp:*',
|
| - ],
|
| - }],
|
| - ['use_aura==1', {
|
| - 'dependencies': [
|
| - '../ui/aura/aura.gyp:*',
|
| - ],
|
| - }],
|
| ['use_ash==1', {
|
| 'dependencies': [
|
| '../ash/ash.gyp:*',
|
| @@ -450,20 +437,6 @@
|
| '../printing/printing.gyp:printing_unittests',
|
| ],
|
| }],
|
| - ['use_aura==1', {
|
| - 'dependencies': [
|
| - '../ui/app_list/app_list.gyp:app_list_unittests',
|
| - '../ui/aura/aura.gyp:aura_unittests',
|
| - '../ui/compositor/compositor.gyp:compositor_unittests',
|
| - '../ui/keyboard/keyboard.gyp:keyboard_unittests',
|
| - '../ui/views/views.gyp:views_unittests',
|
| - ],
|
| - }],
|
| - ['use_aura==1 or toolkit_views==1', {
|
| - 'dependencies': [
|
| - '../ui/events/events.gyp:events_unittests',
|
| - ],
|
| - }],
|
| ['use_ash==1', {
|
| 'dependencies': [
|
| '../ash/ash.gyp:ash_unittests',
|
| @@ -1100,7 +1073,6 @@
|
| '../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',
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| 'conditions': [
|
| @@ -1197,10 +1169,7 @@
|
| '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
|
| '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests',
|
| '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests',
|
| - '../ui/accessibility/accessibility.gyp:accessibility_unittests',
|
| '../ui/app_list/app_list.gyp:app_list_unittests',
|
| - '../ui/aura/aura.gyp:aura_unittests',
|
| - '../ui/compositor/compositor.gyp:compositor_unittests',
|
| '../ui/display/display.gyp:display_unittests',
|
| '../ui/events/events.gyp:events_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| @@ -1247,7 +1216,6 @@
|
| '../ui/base/ui_base_tests.gyp:ui_base_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',
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| 'conditions': [
|
| @@ -1287,9 +1255,7 @@
|
| '../remoting/remoting.gyp:remoting_unittests',
|
| '../skia/skia_tests.gyp:skia_unittests',
|
| '../ui/app_list/app_list.gyp:*',
|
| - '../ui/aura/aura.gyp:*',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| - '../ui/compositor/compositor.gyp:*',
|
| '../ui/display/display.gyp:display_unittests',
|
| '../ui/events/events.gyp:*',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| @@ -1297,10 +1263,6 @@
|
| '../ui/message_center/message_center.gyp:*',
|
| '../ui/snapshot/snapshot.gyp:snapshot_unittests',
|
| '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| - '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
|
| - '../ui/views/views.gyp:views',
|
| - '../ui/views/views.gyp:views_unittests',
|
| - '../ui/wm/wm.gyp:*',
|
| 'blink_tests',
|
| ],
|
| 'conditions': [
|
| @@ -1342,12 +1304,6 @@
|
| '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests',
|
| ],
|
| }],
|
| - ['use_ozone==1', {
|
| - 'dependencies': [
|
| - '../ui/ozone/ozone.gyp:*',
|
| - '../ui/ozone/demo/ozone_demos.gyp:*',
|
| - ],
|
| - }],
|
| ],
|
| },
|
| ], # targets
|
| @@ -1402,18 +1358,5 @@
|
| }, # target_name: chromoting_swarm_tests
|
| ]
|
| }],
|
| - ['OS=="mac" and toolkit_views==1', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'macviews_builder',
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
|
| - '../ui/views/views.gyp:views',
|
| - '../ui/views/views.gyp:views_unittests',
|
| - ],
|
| - }, # target_name: macviews_builder
|
| - ], # targets
|
| - }], # os=='mac' and toolkit_views==1
|
| ], # conditions
|
| }
|
|
|