Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1703)

Unified Diff: ash/ash.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index ac771353ed6ec5ed9afdda32a1b1876806f10c73..d0ad39c8a81ef718c753fc895dc0684ec6fc3964 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',
« no previous file with comments | « DEPS ('k') | build/temp_gyp/googleurl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698