mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert 193968 "Roll the DEPS for google-url." 

> Roll the DEPS for google-url.
> 
> And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
> 
> This also changes googleurl.gyp to reference the files under url/, so that we
> don't break the Blink tree.
> 
> BUG=229660
> R=brettw@chromium.org
> TBR=brettw@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/14089011

TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14028012

git-svn-id: http://src.chromium.org/svn/trunk/src/build@193983 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
michaeln@google.com 2013-04-12 19:23:04 +00:00
Родитель 48931d87e9
Коммит 513359364c
2 изменённых файлов: 102 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
all.gyp
Просмотреть файл

@ -27,8 +27,8 @@
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../ui/ui.gyp:*',
'../url/url.gyp:*',
'../webkit/support/webkit_support.gyp:*',
'temp_gyp/googleurl.gyp:*',
],
'conditions': [
['OS!="ios"', {
@ -203,7 +203,7 @@
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../ui/ui.gyp:ui_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
['OS!="ios"', {
@ -458,8 +458,8 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@ -489,8 +489,8 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@ -500,15 +500,15 @@
'../base/base.gyp:base_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
'../net/net.gyp:net_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
],
},
{
@ -542,7 +542,7 @@
'../sync/sync.gyp:sync_unit_tests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
], # targets
@ -587,9 +587,9 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:googleurl_unittests',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
['target_arch!="x64"', {
@ -644,7 +644,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{
@ -667,7 +667,7 @@
'../sql/sql.gyp:sql_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../url/url.gyp:googleurl_unittests',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
},
{

96
temp_gyp/googleurl.gyp
Просмотреть файл

@ -2,6 +2,7 @@
# 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,
@ -9,13 +10,100 @@
'targets': [
{
'target_name': 'googleurl',
'type': 'none',
'type': '<(component)',
'dependencies': [
'../../url/url.gyp:url',
'../../base/base.gyp:base',
'../../third_party/icu/icu.gyp:icudata',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
],
'export_dependent_settings': [
'../../url/url.gyp:url',
'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',
],
'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': 'googleurl_unittests',
'type': 'executable',
'dependencies': [
'googleurl',
'../../base/base.gyp:base_i18n',
'../../base/base.gyp:run_all_unittests',
'../../testing/gtest.gyp:gtest',
'../../third_party/icu/icu.gyp:icuuc',
],
'sources': [
'../../googleurl/src/gurl_unittest.cc',
'../../googleurl/src/url_canon_unittest.cc',
'../../googleurl/src/url_parse_unittest.cc',
'../../googleurl/src/url_test_utils.h',
'../../googleurl/src/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, ],
},
],
}