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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/ash.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index ac771353..d0ad39c 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -15,11 +15,9 @@ 'target_name': 'ash', 'type': '<(component)', 'dependencies': [ - 'ash_strings.gyp:ash_strings', '../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', '../cc/cc.gyp:cc', '../content/content.gyp:content', '../content/content.gyp:content_browser', @@ -32,14 +30,16 @@ '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/compositor/compositor.gyp:compositor', + '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', '../ui/oak/oak.gyp:oak', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', - '../ui/keyboard/keyboard.gyp:keyboard', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', + '../url/url.gyp:url_lib', + 'ash_strings.gyp:ash_strings', 'ash_resources', 'ash_wallpaper_resources', ], @@ -594,20 +594,18 @@ 'target_name': 'ash_unittests', 'type': 'executable', 'dependencies': [ - 'ash_strings.gyp:ash_strings', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../chrome/chrome_resources.gyp:packed_resources', '../content/content.gyp:content_browser', '../content/content.gyp:test_support_content', - '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', - '../ui/app_list/app_list.gyp:app_list', '../ui/compositor/compositor.gyp:compositor', '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', @@ -615,10 +613,12 @@ '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_test_support', '../ui/views/views.gyp:views', - '../ui/views/views.gyp:views_test_support', '../ui/views/views.gyp:views_examples_with_content_lib', + '../ui/views/views.gyp:views_test_support', '../ui/views/views.gyp:views_with_content_test_support', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', + '../url/url.gyp:url_lib', + 'ash_strings.gyp:ash_strings', 'ash', 'ash_resources', 'ash_test_support', |