summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:32:19 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:32:19 +0000
commit1027c8cc041f364d39ccdefc1cd9d25a6c79e60d (patch)
treeef66315b0fe4a4126c1ba9fe17534c3dc16e0fef /content
parent837d51d107816ec5c91ea42980f07232cad67a4d (diff)
downloadchromium_src-1027c8cc041f364d39ccdefc1cd9d25a6c79e60d.zip
chromium_src-1027c8cc041f364d39ccdefc1cd9d25a6c79e60d.tar.gz
chromium_src-1027c8cc041f364d39ccdefc1cd9d25a6c79e60d.tar.bz2
ui: Have shell_dialogs into its own gyp file under its shell_dialogs/ directory.
This is the pattern we follow for projects under ui/, each top-level directory (app_list, aura, compositor, events) have its own gyp file for its main target (library). BUG=299841 TEST=build/gyp_chromium, ninja -C out/Debug shell_dialogs, and other targets still build. R=ben@chromium.org Review URL: https://codereview.chromium.org/47323002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/content_common.gypi2
-rw-r--r--content/content_tests.gypi6
2 files changed, 4 insertions, 4 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ef8293d..0f20c4b 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -10,7 +10,7 @@
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
'../ui/gfx/gfx.gyp:gfx',
- '../ui/ui.gyp:shell_dialogs',
+ '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
'../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 5e750c4..9f425ff 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -17,7 +17,7 @@
'../ui/ui.gyp:keycode_converter',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
- '../ui/ui.gyp:ui_test_support',
+ '../ui/ui_unittests.gyp:ui_test_support',
'../url/url.gyp:url_lib',
'browser/speech/proto/speech_proto.gyp:speech_proto',
'content.gyp:content_app_both',
@@ -289,7 +289,7 @@
}],
['OS=="android"', {
'dependencies': [
- '../ui/ui.gyp:shell_dialogs',
+ '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'test_support_content_jni_headers',
],
}],
@@ -859,8 +859,8 @@
'../third_party/mesa/mesa.gyp:osmesa',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
+ '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'../ui/snapshot/snapshot.gyp:snapshot',
- '../ui/ui.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
'../webkit/glue/webkit_glue.gyp:glue',