summaryrefslogtreecommitdiffstats
path: root/ash/ash.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 10:20:37 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 10:20:37 +0000
commited8fd9152e0dff6c26f69f968e0d4aa4bd890d57 (patch)
tree163fe12566ebad286d91d12820f078b240e2db26 /ash/ash.gyp
parent4795329fcd7308914fcdbee6f824c250cfae2629 (diff)
downloadchromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.zip
chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.gz
chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.bz2
Move ui.gyp into ui/base/ directory.
This follows the rule we setup for //ui which states that each subdir should be its own component with its own gyp file that lives in its subdir. The 'ui' target was renamed to ui_base to match the convention. BUG=299841 TEST=gyp files. TBR=ben@chromium.org Review URL: https://codereview.chromium.org/198333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
-rw-r--r--ash/ash.gyp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 96ba4d7..7c3fb5b 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -28,6 +28,7 @@
'../ui/app_list/app_list.gyp:app_list',
'../ui/aura/aura.gyp:aura',
'../ui/base/strings/ui_strings.gyp:ui_strings',
+ '../ui/base/ui_base.gyp:ui_base',
'../ui/compositor/compositor.gyp:compositor',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
@@ -35,7 +36,6 @@
'../ui/keyboard/keyboard.gyp:keyboard',
'../ui/message_center/message_center.gyp:message_center',
'../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/ui.gyp:ui',
'../ui/views/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
@@ -698,12 +698,12 @@
'../skia/skia.gyp:skia',
'../ui/aura/aura.gyp:aura',
'../ui/base/strings/ui_strings.gyp:ui_strings',
+ '../ui/base/ui_base.gyp:ui_base',
'../ui/compositor/compositor.gyp:compositor',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/ui.gyp:ui',
'../ui/views/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
@@ -821,6 +821,7 @@
'../ui/app_list/app_list.gyp:app_list',
'../ui/aura/aura.gyp:aura',
'../ui/aura/aura.gyp:aura_test_support',
+ '../ui/base/ui_base.gyp:ui_base',
'../ui/compositor/compositor.gyp:compositor',
'../ui/compositor/compositor.gyp:compositor_test_support',
'../ui/events/events.gyp:events',
@@ -831,7 +832,6 @@
'../ui/message_center/message_center.gyp:message_center',
'../ui/message_center/message_center.gyp:message_center_test_support',
'../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/ui.gyp:ui',
'../ui/ui_unittests.gyp:ui_test_support',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_examples_with_content_lib',
@@ -1055,6 +1055,7 @@
'../third_party/icu/icu.gyp:icuuc',
'../ui/app_list/app_list.gyp:app_list',
'../ui/aura/aura.gyp:aura',
+ '../ui/base/ui_base.gyp:ui_base',
'../ui/compositor/compositor.gyp:compositor',
'../ui/events/events.gyp:events',
'../ui/gfx/gfx.gyp:gfx',
@@ -1062,7 +1063,6 @@
'../ui/keyboard/keyboard.gyp:keyboard',
'../ui/message_center/message_center.gyp:message_center',
'../ui/resources/ui_resources.gyp:ui_resources',
- '../ui/ui.gyp:ui',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_examples_lib',
'../ui/views/views.gyp:views_examples_with_content_lib',