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 /chrome/chrome_browser_chromeos.gypi | |
| 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 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 96a0b5d..a9c6f7d 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -22,10 +22,10 @@ }, 'dependencies': [ # TODO(tbarzic): Cleanup this list. - 'app/policy/cloud_policy_codegen.gyp:policy', 'attestation_proto', - 'browser_extensions', + 'app/policy/cloud_policy_codegen.gyp:policy', 'browser/performance_monitor/performance_monitor.gyp:performance_monitor', + 'browser_extensions', 'cert_logger_proto', 'chrome_resources.gyp:chrome_extra_resources', 'chrome_resources.gyp:chrome_resources', @@ -45,12 +45,11 @@ 'safe_browsing_report_proto', 'variations_seed_proto', '../build/linux/system.gyp:dbus', - '../build/temp_gyp/googleurl.gyp:googleurl', '../chromeos/chromeos.gyp:chromeos', '../chromeos/chromeos.gyp:chromeos_memory', + '../chromeos/ime/input_method.gyp:gencode', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', - '../chromeos/ime/input_method.gyp:gencode', '../crypto/crypto.gyp:crypto', '../dbus/dbus.gyp:dbus', '../device/bluetooth/bluetooth.gyp:device_bluetooth', @@ -77,20 +76,22 @@ '../third_party/npapi/npapi.gyp:npapi', '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/protobuf/protobuf.gyp:protoc#host', - 'chrome_resources.gyp:chrome_strings', '../third_party/re2/re2.gyp:re2', '../third_party/zlib/zlib.gyp:zlib', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', + '../ui/views/controls/webview/webview.gyp:webview', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', + '../url/url.gyp:url_lib', '../v8/tools/gyp/v8.gyp:v8', '../ui/views/controls/webview/webview.gyp:webview', '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_storage', + 'chrome_resources.gyp:chrome_strings', ], 'defines': [ '<@(nacl_defines)', |