summaryrefslogtreecommitdiffstats
path: root/build/temp_gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-27 05:51:05 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-27 05:51:05 +0000
commit4f0e111044e56a31274813aecd8ae1384e6a0a12 (patch)
tree3c09d14019b254d27120f484e2efc8e01df66e7e /build/temp_gyp
parentf7d852f9dcf8d13ebd55c4e4dde63b21d43cb6c9 (diff)
downloadchromium_src-4f0e111044e56a31274813aecd8ae1384e6a0a12.zip
chromium_src-4f0e111044e56a31274813aecd8ae1384e6a0a12.tar.gz
chromium_src-4f0e111044e56a31274813aecd8ae1384e6a0a12.tar.bz2
Make build/temp_gyp/googleurl a 'none' target that depends on the 'real' src/googleurl/googleurl.gyp
This is the first step to change all the references from build/temp_gyp/ to the new location in src/googleurl/ R=brettw@chromium.org,rsleevi@chromium.org TBR=darin@chromium.org # for gyp change. Review URL: https://chromiumcodereview.appspot.com/12073003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp')
-rw-r--r--build/temp_gyp/googleurl.gyp99
1 files changed, 6 insertions, 93 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp
index 2f6f89a..5fd1285 100644
--- a/build/temp_gyp/googleurl.gyp
+++ b/build/temp_gyp/googleurl.gyp
@@ -2,7 +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.
+# TODO(tfarina): Remove this file when all the references are updated.
{
'variables': {
'chromium_code': 1,
@@ -10,100 +10,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',
+ '../../googleurl/googleurl.gyp:googleurl',
],
- '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, ],
+ 'export_dependent_settings': [
+ '../../googleurl/googleurl.gyp:googleurl',
+ ]
},
],
}