summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 02:03:28 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 02:03:28 +0000
commit1c0c3f42418251f64b7d1dab5e7660662cb04f65 (patch)
treebe4e5f1db0e99aacfebaff23828c35541428d2e1 /webkit
parent72e280f92a10f5c9f22703d1fb8f010095c0ab60 (diff)
downloadchromium_src-1c0c3f42418251f64b7d1dab5e7660662cb04f65.zip
chromium_src-1c0c3f42418251f64b7d1dab5e7660662cb04f65.tar.gz
chromium_src-1c0c3f42418251f64b7d1dab5e7660662cb04f65.tar.bz2
Dissociate ui_resources target from ui.gyp.
This is the first step for moving ui.gyp into ui/base/ After this lands, Blink will be updated to reference the new file under ui/resources. Then the by-pass target will be removed from ui.gyp. And then we can move it to its finall location. BUG=299841 TEST=None R=ben@chromium.org Review URL: https://codereview.chromium.org/74853003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/common/webkit_common.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index 508c1e4..0a162bc 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -21,8 +21,8 @@
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
+ '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
'<(DEPTH)/ui/ui.gyp:ui',
- '<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
],