| Index: ui/aura/aura.gyp
|
| diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
|
| index 5a1660886a26ee02d6438d0f8b6948207e1143ea..22703ea6f93da574036720db175f0b6b5e1a8978 100644
|
| --- a/ui/aura/aura.gyp
|
| +++ b/ui/aura/aura.gyp
|
| @@ -16,12 +16,12 @@
|
| '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| '../../gpu/gpu.gyp:gpu',
|
| '../../skia/skia.gyp:skia',
|
| + '../base/ui_base.gyp:ui_base',
|
| '../compositor/compositor.gyp:compositor',
|
| '../events/events.gyp:events',
|
| '../events/events.gyp:events_base',
|
| '../gfx/gfx.gyp:gfx',
|
| '../gfx/gfx.gyp:gfx_geometry',
|
| - '../ui.gyp:ui',
|
| ],
|
| 'defines': [
|
| 'AURA_IMPLEMENTATION',
|
| @@ -146,13 +146,13 @@
|
| 'dependencies': [
|
| '../../skia/skia.gyp:skia',
|
| '../../testing/gtest.gyp:gtest',
|
| + '../base/ui_base.gyp:ui_base',
|
| '../compositor/compositor.gyp:compositor_test_support',
|
| '../events/events.gyp:events',
|
| '../events/events.gyp:events_base',
|
| '../events/events.gyp:events_test_support',
|
| '../gfx/gfx.gyp:gfx',
|
| '../gfx/gfx.gyp:gfx_geometry',
|
| - '../ui.gyp:ui',
|
| '../ui_unittests.gyp:ui_test_support',
|
| 'aura',
|
| ],
|
| @@ -199,12 +199,12 @@
|
| '../../skia/skia.gyp:skia',
|
| '../../third_party/icu/icu.gyp:icui18n',
|
| '../../third_party/icu/icu.gyp:icuuc',
|
| + '../base/ui_base.gyp:ui_base',
|
| '../compositor/compositor.gyp:compositor',
|
| '../compositor/compositor.gyp:compositor_test_support',
|
| '../events/events.gyp:events',
|
| '../gfx/gfx.gyp:gfx',
|
| '../gfx/gfx.gyp:gfx_geometry',
|
| - '../ui.gyp:ui',
|
| 'aura',
|
| 'aura_test_support',
|
| ],
|
| @@ -225,12 +225,12 @@
|
| '../../skia/skia.gyp:skia',
|
| '../../third_party/icu/icu.gyp:icui18n',
|
| '../../third_party/icu/icu.gyp:icuuc',
|
| + '../base/ui_base.gyp:ui_base',
|
| '../compositor/compositor.gyp:compositor',
|
| '../compositor/compositor.gyp:compositor_test_support',
|
| '../events/events.gyp:events',
|
| '../gfx/gfx.gyp:gfx',
|
| '../gfx/gfx.gyp:gfx_geometry',
|
| - '../ui.gyp:ui',
|
| 'aura',
|
| 'aura_test_support',
|
| ],
|
| @@ -248,6 +248,7 @@
|
| '../../base/base.gyp:test_support_base',
|
| '../../skia/skia.gyp:skia',
|
| '../../testing/gtest.gyp:gtest',
|
| + '../base/ui_base.gyp:ui_base',
|
| '../compositor/compositor.gyp:compositor',
|
| '../compositor/compositor.gyp:compositor_test_support',
|
| '../events/events.gyp:events',
|
| @@ -255,7 +256,6 @@
|
| '../gfx/gfx.gyp:gfx',
|
| '../gfx/gfx.gyp:gfx_geometry',
|
| '../gl/gl.gyp:gl',
|
| - '../ui.gyp:ui',
|
| '../ui_unittests.gyp:ui_test_support',
|
| 'aura_test_support',
|
| 'aura',
|
|
|