diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 02:03:28 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 02:03:28 +0000 |
| commit | 1c0c3f42418251f64b7d1dab5e7660662cb04f65 (patch) | |
| tree | be4e5f1db0e99aacfebaff23828c35541428d2e1 /ui/compositor/compositor.gyp | |
| parent | 72e280f92a10f5c9f22703d1fb8f010095c0ab60 (diff) | |
| download | chromium_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 'ui/compositor/compositor.gyp')
| -rw-r--r-- | ui/compositor/compositor.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index ae25017..a2d3a75 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -63,7 +63,7 @@ # TODO(sky): before we make this real need to remove # IDR_BITMAP_BRUSH_IMAGE. 'dependencies': [ - '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', '<(angle_path)/src/build_angle.gyp:libEGL', '<(angle_path)/src/build_angle.gyp:libGLESv2', ], @@ -110,8 +110,8 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/ui/gl/gl.gyp:gl', + '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', '<(DEPTH)/ui/ui.gyp:ui', - '<(DEPTH)/ui/ui.gyp:ui_resources', 'compositor', 'compositor_test_support', ], |