| Index: url/BUILD.gn
|
| diff --git a/url/BUILD.gn b/url/BUILD.gn
|
| index 828c9ad4e6ad9c98002337024aa3aace10d6ed8f..f595d4cbc89a08f5f88bb1dddb4ab305f3c212c0 100644
|
| --- a/url/BUILD.gn
|
| +++ b/url/BUILD.gn
|
| @@ -113,42 +113,39 @@ if (is_android) {
|
| }
|
| }
|
|
|
| -# TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
|
| -if (!is_android) {
|
| - test("url_unittests") {
|
| - sources = [
|
| - "gurl_unittest.cc",
|
| - "origin_unittest.cc",
|
| - "run_all_unittests.cc",
|
| - "scheme_host_port_unittest.cc",
|
| - "url_canon_icu_unittest.cc",
|
| - "url_canon_unittest.cc",
|
| - "url_parse_unittest.cc",
|
| - "url_test_utils.h",
|
| - "url_util_unittest.cc",
|
| - ]
|
| +test("url_unittests") {
|
| + sources = [
|
| + "gurl_unittest.cc",
|
| + "origin_unittest.cc",
|
| + "run_all_unittests.cc",
|
| + "scheme_host_port_unittest.cc",
|
| + "url_canon_icu_unittest.cc",
|
| + "url_canon_unittest.cc",
|
| + "url_parse_unittest.cc",
|
| + "url_test_utils.h",
|
| + "url_util_unittest.cc",
|
| + ]
|
|
|
| - if (!is_ios) {
|
| - sources += [ "mojo/url_gurl_struct_traits_unittest.cc" ]
|
| - }
|
| + if (!is_ios) {
|
| + sources += [ "mojo/url_gurl_struct_traits_unittest.cc" ]
|
| + }
|
|
|
| - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
| + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
| - deps = [
|
| - ":url",
|
| - "//base",
|
| - "//base/test:test_support",
|
| - "//testing/gtest",
|
| - "//third_party/icu:icuuc",
|
| - ]
|
| + deps = [
|
| + ":url",
|
| + "//base",
|
| + "//base/test:test_support",
|
| + "//testing/gtest",
|
| + "//third_party/icu:icuuc",
|
| + ]
|
|
|
| - if (!is_ios) {
|
| - deps += [
|
| - "//mojo/edk/system",
|
| - "//mojo/edk/test:test_support",
|
| - "//url/mojo:test_url_mojom_gurl",
|
| - ]
|
| - }
|
| + if (!is_ios) {
|
| + deps += [
|
| + "//mojo/edk/system",
|
| + "//mojo/edk/test:test_support",
|
| + "//url/mojo:test_url_mojom_gurl",
|
| + ]
|
| }
|
| }
|
|
|