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: http://src.chromium.org/svn/trunk/src/build@203672 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
f2ea0ef38f
Коммит
a02f571ff1
|
@ -2,7 +2,6 @@
|
|||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
# TODO(mark): Upstream this file to googleurl.
|
||||
{
|
||||
'variables': {
|
||||
'chromium_code': 1,
|
||||
|
@ -10,66 +9,13 @@
|
|||
'targets': [
|
||||
{
|
||||
'target_name': 'googleurl',
|
||||
'type': '<(component)',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'../../base/base.gyp:base',
|
||||
'../../third_party/icu/icu.gyp:icudata',
|
||||
'../../third_party/icu/icu.gyp:icui18n',
|
||||
'../../third_party/icu/icu.gyp:icuuc',
|
||||
'../../url/url.gyp:url_lib',
|
||||
],
|
||||
'sources': [
|
||||
'../../googleurl/src/gurl.cc',
|
||||
'../../googleurl/src/gurl.h',
|
||||
'../../googleurl/src/url_canon.h',
|
||||
'../../googleurl/src/url_canon_etc.cc',
|
||||
'../../googleurl/src/url_canon_fileurl.cc',
|
||||
'../../googleurl/src/url_canon_filesystemurl.cc',
|
||||
'../../googleurl/src/url_canon_host.cc',
|
||||
'../../googleurl/src/url_canon_icu.cc',
|
||||
'../../googleurl/src/url_canon_icu.h',
|
||||
'../../googleurl/src/url_canon_internal.cc',
|
||||
'../../googleurl/src/url_canon_internal.h',
|
||||
'../../googleurl/src/url_canon_internal_file.h',
|
||||
'../../googleurl/src/url_canon_ip.cc',
|
||||
'../../googleurl/src/url_canon_ip.h',
|
||||
'../../googleurl/src/url_canon_mailtourl.cc',
|
||||
'../../googleurl/src/url_canon_path.cc',
|
||||
'../../googleurl/src/url_canon_pathurl.cc',
|
||||
'../../googleurl/src/url_canon_query.cc',
|
||||
'../../googleurl/src/url_canon_relative.cc',
|
||||
'../../googleurl/src/url_canon_stdstring.h',
|
||||
'../../googleurl/src/url_canon_stdurl.cc',
|
||||
'../../googleurl/src/url_file.h',
|
||||
'../../googleurl/src/url_parse.cc',
|
||||
'../../googleurl/src/url_parse.h',
|
||||
'../../googleurl/src/url_parse_file.cc',
|
||||
'../../googleurl/src/url_parse_internal.h',
|
||||
'../../googleurl/src/url_util.cc',
|
||||
'../../googleurl/src/url_util.h',
|
||||
'export_dependent_settings': [
|
||||
'../../url/url.gyp:url_lib',
|
||||
],
|
||||
'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, ],
|
||||
},
|
||||
],
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче