diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 05:40:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 05:40:29 +0000 |
| commit | 002cc08fc2472a54222729082f0be64da4212495 (patch) | |
| tree | 2d4db929a2801368177f2ea1ac42f2873858f909 /ppapi | |
| parent | 67e264aed134194e895af888f469ec869f20df99 (diff) | |
| download | chromium_src-002cc08fc2472a54222729082f0be64da4212495.zip chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.gz chromium_src-002cc08fc2472a54222729082f0be64da4212495.tar.bz2 | |
Roll DEPS for googleurl. Second try.
- Update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
r184: Fix C++11 compilation on iOS
r185: Forward includes to url/
BUG=229660
R=thestig@chromium.org,brettw@chromium.org
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15421002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_host.gypi | 10 | ||||
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ppapi/ppapi_host.gypi b/ppapi/ppapi_host.gypi index 55bc545..e65cbcd 100644 --- a/ppapi/ppapi_host.gypi +++ b/ppapi/ppapi_host.gypi @@ -8,15 +8,15 @@ 'target_name': 'ppapi_host', 'type': '<(component)', 'dependencies': [ - 'ppapi.gyp:ppapi_c', - 'ppapi_internal.gyp:ppapi_proxy', - 'ppapi_internal.gyp:ppapi_ipc', - 'ppapi_internal.gyp:ppapi_shared', '../base/base.gyp:base', - '../build/temp_gyp/googleurl.gyp:googleurl', '../ipc/ipc.gyp:ipc', '../media/media.gyp:shared_memory_support', '../ui/surface/surface.gyp:surface', + '../url/url.gyp:url_lib', + 'ppapi.gyp:ppapi_c', + 'ppapi_internal.gyp:ppapi_ipc', + 'ppapi_internal.gyp:ppapi_proxy', + 'ppapi_internal.gyp:ppapi_shared', ], 'defines': [ 'PPAPI_HOST_IMPLEMENTATION', diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index fd82adc..29a60db 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -42,11 +42,9 @@ 'ppapi_shared_target': 1, }, 'dependencies': [ - 'ppapi.gyp:ppapi_c', '../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', @@ -56,6 +54,8 @@ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/icu/icu.gyp:icuuc', '../ui/surface/surface.gyp:surface', + '../url/url.gyp:url_lib', + 'ppapi.gyp:ppapi_c', ], 'export_dependent_settings': [ '../base/base.gyp:base', |