Skip to content

Commit

Permalink
Move url BUILD.gn file to main tree.
Browse files Browse the repository at this point in the history
This also fixes some base errors found while url_unittests was trying to
link due to the missing entries of file_* not being present in
base/BUILD.gn.

BUG=None
TEST=gn, ninja -C out/Default url_unittests
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/124723002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243045 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tfarina@chromium.org committed Jan 5, 2014
1 parent 47a69ab commit fa8d1b6
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
5 changes: 4 additions & 1 deletion base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ component("base") {
"files/dir_reader_fallback.h",
"files/dir_reader_linux.h",
"files/dir_reader_posix.h",
"files/file.cc",
"files/file_posix.cc",
"files/file_win.cc",
"files/file_enumerator.cc",
"files/file_enumerator.h",
"files/file_enumerator_posix.cc",
Expand All @@ -166,8 +169,8 @@ component("base") {
"files/file_path_watcher_win.cc",
"files/file_util_proxy.cc",
"files/file_util_proxy.h",
"files/important_file_writer.h",
"files/important_file_writer.cc",
"files/important_file_writer.h",
"files/memory_mapped_file.cc",
"files/memory_mapped_file.h",
"files/memory_mapped_file_posix.cc",
Expand Down
2 changes: 1 addition & 1 deletion tools/gn/secondary/ipc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ test("ipc_perftests") {
#}
#if (is_posix && !is_mac && !is_android) {
# if (linux_use_tcmalloc) {
# deps += "/base/allocator"
# deps += "//base/allocator"
# }
#}

Expand Down
17 changes: 17 additions & 0 deletions tools/gn/secondary/url/BUILD.gn → url/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ component("url") {
"url_canon_stdstring.cc",
"url_canon_stdstring.h",
"url_canon_stdurl.cc",
"url_export.h",
"url_file.h",
"url_parse_file.cc",
"url_parse_internal.h",
Expand All @@ -42,6 +43,11 @@ component("url") {

defines = [ "URL_IMPLEMENTATION" ]

# if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
# 'msvs_disabled_warnings': [ 4267, ]
# }

deps = [
"//base",
"//third_party/icu:icudata",
Expand All @@ -60,6 +66,17 @@ test("url_unittests") {
"url_util_unittest.cc",
]

#if (is_posix && !is_mac && !is_ios) {
# if (linux_use_tcmalloc) {
# deps += "//base/allocator"
# }
#}

# if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
# 'msvs_disabled_warnings': [ 4267, ]
# }

deps = [
":url",
"//base:base_i18n",
Expand Down

0 comments on commit fa8d1b6

Please sign in to comment.