diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-15 09:30:46 +0000 |
commit | 2244f0a5a874fd21da847fca2afc26dc16de7ccc (patch) | |
tree | cfdf45cc5eca43593ecd0e65eb1d2f4caf033f92 /url/url.gyp | |
parent | 0b7b7c213dec8e26c4c061f316e938923b1a7f02 (diff) | |
download | chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.zip chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.gz chromium_src-2244f0a5a874fd21da847fca2afc26dc16de7ccc.tar.bz2 |
Revert 193777 "url: Changes to make it build standalone."
url/url_canon_stdstring.h:65: error: undefined reference to 'vtable for url_canon::StdStringCanonOutput'
> url: Changes to make it build standalone.
>
> - Update the gyp file.
> - Rename the gyp file from googleurl.gyp to url.gyp, so it matches the directory
> name.
> - Update the header include paths.
> - Update the header include guards.
> - Rename the target name from googleurl to url and googleurl_unittests to
> url_unittests.
> - Add missing OVERRIDEs where clang complains.
>
> BUG=229660
> TEST=url_unittests
> R=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/14016005
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14264002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url.gyp')
-rw-r--r-- | url/url.gyp | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/url/url.gyp b/url/url.gyp deleted file mode 100644 index 6247089..0000000 --- a/url/url.gyp +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, - }, - 'targets': [ - { - 'target_name': 'url', - 'type': '<(component)', - 'dependencies': [ - '../base/base.gyp:base', - '../third_party/icu/icu.gyp:icudata', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - ], - 'sources': [ - 'gurl.cc', - 'gurl.h', - 'url_canon.h', - 'url_canon_etc.cc', - 'url_canon_fileurl.cc', - 'url_canon_filesystemurl.cc', - 'url_canon_host.cc', - 'url_canon_icu.cc', - 'url_canon_icu.h', - 'url_canon_internal.cc', - 'url_canon_internal.h', - 'url_canon_internal_file.h', - 'url_canon_ip.cc', - 'url_canon_ip.h', - 'url_canon_mailtourl.cc', - 'url_canon_path.cc', - 'url_canon_pathurl.cc', - 'url_canon_query.cc', - 'url_canon_relative.cc', - 'url_canon_stdstring.cc', - 'url_canon_stdstring.h', - 'url_canon_stdurl.cc', - 'url_file.h', - 'url_parse.cc', - 'url_parse.h', - 'url_parse_file.cc', - 'url_parse_internal.h', - 'url_util.cc', - 'url_util.h', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, - 'defines': [ - 'FULL_FILESYSTEM_URL_SUPPORT=1', - ], - 'conditions': [ - ['component=="shared_library"', { - 'defines': [ - 'GURL_DLL', - 'GURL_IMPLEMENTATION=1', - ], - 'direct_dependent_settings': { - 'defines': [ - 'GURL_DLL', - ], - }, - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - { - 'target_name': 'url_unittests', - 'type': 'executable', - 'dependencies': [ - 'url', - '../base/base.gyp:base_i18n', - '../base/base.gyp:run_all_unittests', - '../testing/gtest.gyp:gtest', - '../third_party/icu/icu.gyp:icuuc', - ], - 'sources': [ - 'gurl_unittest.cc', - 'url_canon_unittest.cc', - 'url_parse_unittest.cc', - 'url_test_utils.h', - 'url_util_unittest.cc', - ], - 'defines': [ - 'FULL_FILESYSTEM_URL_SUPPORT=1', - ], - 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios"', { - 'conditions': [ - ['linux_use_tcmalloc==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }], - ], - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [4267, ], - }, - ], -} |