diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
| commit | 173509e01940012228b386bf50c26d42e1586022 (patch) | |
| tree | 523d90bc858cffd19441f4f2259e49f512c681e2 /ppapi/ppapi_internal.gyp | |
| parent | e217c563ed3adcee9d4fd6135b260e8084c12401 (diff) | |
| download | chromium_src-173509e01940012228b386bf50c26d42e1586022.zip chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.gz chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.bz2 | |
Revert 193968 "Roll the DEPS for google-url."
> Roll the DEPS for google-url.
>
> And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
>
> This also changes googleurl.gyp to reference the files under url/, so that we
> don't break the Blink tree.
>
> BUG=229660
> R=brettw@chromium.org
> TBR=brettw@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/14089011
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14028012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_internal.gyp')
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 3f73728..6d75638 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -46,13 +46,13 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../build/temp_gyp/googleurl.gyp:googleurl', '../gpu/command_buffer/command_buffer.gyp:gles2_utils', '../gpu/gpu.gyp:command_buffer_client', '../gpu/gpu.gyp:gles2_implementation', '../media/media.gyp:shared_memory_support', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icuuc', - '../url/url.gyp:url', # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL. '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', '../ui/surface/surface.gyp:surface', |