diff options
Diffstat (limited to 'url')
| -rw-r--r-- | url/url.gyp | 45 | ||||
| -rw-r--r-- | url/url_nacl.gyp | 37 | ||||
| -rw-r--r-- | url/url_srcs.gypi | 38 |
3 files changed, 82 insertions, 38 deletions
diff --git a/url/url.gyp b/url/url.gyp index d57c476..d47748c 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -6,6 +6,9 @@ 'variables': { 'chromium_code': 1, }, + 'includes': [ + 'url_srcs.gypi', + ], 'targets': [ { # Note, this target_name cannot be 'url', because that will generate @@ -20,35 +23,7 @@ '../third_party/icu/icu.gyp:icuuc', ], 'sources': [ - 'gurl.cc', - 'gurl.h', - 'third_party/mozilla/url_parse.cc', - 'third_party/mozilla/url_parse.h', - 'url_canon.h', - 'url_canon_etc.cc', - 'url_canon_filesystemurl.cc', - 'url_canon_fileurl.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_file.cc', - 'url_parse_internal.h', - 'url_util.cc', - 'url_util.h', + '<@(gurl_sources)', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -79,16 +54,10 @@ 'url_util_unittest.cc', ], 'conditions': [ - ['os_posix==1 and OS!="mac" and OS!="ios"', + ['os_posix==1 and OS!="mac" and OS!="ios" and linux_use_tcmalloc==1', { - 'conditions': [ - ['linux_use_tcmalloc==1', - { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - } - ], + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', ], } ], diff --git a/url/url_nacl.gyp b/url/url_nacl.gyp new file mode 100644 index 0000000..4af75b1 --- /dev/null +++ b/url/url_nacl.gyp @@ -0,0 +1,37 @@ +# Copyright 2014 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, + }, + 'includes': [ + '../build/common_untrusted.gypi', + 'url_srcs.gypi', + ], + 'targets': [ + { + 'target_name': 'url_nacl', + 'type': 'none', + 'variables': { + 'nlib_target': 'liburl_nacl.a', + 'build_glibc': 0, + 'build_newlib': 0, + 'build_pnacl_newlib': 1, + }, + 'dependencies': [ + '../third_party/icu/icu_nacl.gyp:icudata_nacl', + '../third_party/icu/icu_nacl.gyp:icui18n_nacl', + '../third_party/icu/icu_nacl.gyp:icuuc_nacl', + ], + 'export_dependent_settings': [ + '../third_party/icu/icu_nacl.gyp:icui18n_nacl', + '../third_party/icu/icu_nacl.gyp:icuuc_nacl', + ], + 'sources': [ + '<@(gurl_sources)', + ], + }, # end of target 'url_nacl' + ], +} diff --git a/url/url_srcs.gypi b/url/url_srcs.gypi new file mode 100644 index 0000000..e26bd75 --- /dev/null +++ b/url/url_srcs.gypi @@ -0,0 +1,38 @@ +# Copyright 2014 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': { + 'gurl_sources': [ + 'gurl.cc', + 'gurl.h', + 'third_party/mozilla/url_parse.cc', + 'third_party/mozilla/url_parse.h', + 'url_canon.h', + 'url_canon_etc.cc', + 'url_canon_filesystemurl.cc', + 'url_canon_fileurl.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_stdurl.cc', + 'url_file.h', + 'url_parse_file.cc', + 'url_parse_internal.h', + 'url_util.cc', + 'url_util.h', + ], + }, +} |