summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 16:57:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 16:57:02 +0000
commitdae7844c787c85c84545b2e1820c8ad72fd69e3b (patch)
treea81b3e5a9690b3005e3f29af491c2941b611b726
parent358e20befabcfc1b3f186d3f81e517776605a61c (diff)
downloadchromium_src-dae7844c787c85c84545b2e1820c8ad72fd69e3b.zip
chromium_src-dae7844c787c85c84545b2e1820c8ad72fd69e3b.tar.gz
chromium_src-dae7844c787c85c84545b2e1820c8ad72fd69e3b.tar.bz2
Remove ui_resources target from ui.gyp.
Blink was already updated to reference the target from ui/resources/ui_resources.gyp in https://src.chromium.org/viewvc/blink?view=rev&revision=162387, so now we can remove this target from ui.gyp. BUG=299841 TEST=None R=ben@chromium.org,jochen@chromium.org TBR=ben Review URL: https://codereview.chromium.org/84043003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237348 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/content_shell.gypi2
-rw-r--r--ui/ui.gyp11
2 files changed, 1 insertions, 12 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index b0bf4da..d5798ba 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -234,10 +234,10 @@
'conditions': [
['toolkit_views==1', {
'dependencies': [
+ '../ui/resources/ui_resources.gyp:ui_resources',
'../ui/views/controls/webview/webview.gyp:webview',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_test_support',
- '../ui/ui.gyp:ui_resources',
],
'sources/': [
['exclude', 'shell/browser/shell_aura.cc'],
diff --git a/ui/ui.gyp b/ui/ui.gyp
index dc89034..f6e95ae 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -8,17 +8,6 @@
},
'targets': [
{
- # TODO(tfarina): Remove this target after Blink is updated.
- 'target_name': 'ui_resources',
- 'type': 'none',
- 'dependencies': [
- 'resources/ui_resources.gyp:ui_resources',
- ],
- 'export_dependent_settings': [
- 'resources/ui_resources.gyp:ui_resources',
- ]
- },
- {
'target_name': 'ui',
'type': '<(component)',
'dependencies': [