Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: url/BUILD.gn

Issue 227673008: Checkpoint work to get GN builds working on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge forward to 263376 Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/secondary/third_party/libevent/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/BUILD.gn
diff --git a/url/BUILD.gn b/url/BUILD.gn
index dc4cb0a29421e909645e30c952761a999f2aabef..6445bfbb3d7dcbad895021085c7f3d14f11ccf69 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -54,32 +54,35 @@ component("url") {
]
}
-test("url_unittests") {
- sources = [
- "gurl_unittest.cc",
- "url_canon_unittest.cc",
- "url_parse_unittest.cc",
- "url_test_utils.h",
- "url_util_unittest.cc",
- ]
+# TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
+if (!is_android) {
+ test("url_unittests") {
+ sources = [
+ "gurl_unittest.cc",
+ "url_canon_unittest.cc",
+ "url_parse_unittest.cc",
+ "url_test_utils.h",
+ "url_util_unittest.cc",
+ ]
- #if (is_posix && !is_mac && !is_ios) {
- # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc) {
- # deps += "//base/allocator"
- # }
- #}
+ #if (is_posix && !is_mac && !is_ios) {
+ # # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
+ # if ((use_allocator!="none" && use_allocator!="see_use_tcmalloc") || (use_allocator=="see_use_tcmalloc" && linux_use_tcmalloc) {
+ # deps += "//base/allocator"
+ # }
+ #}
- # if (is_win) {
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- # 'msvs_disabled_warnings': [ 4267, ]
- # }
+ # if (is_win) {
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ # 'msvs_disabled_warnings': [ 4267, ]
+ # }
- deps = [
- ":url",
- "//base:i18n",
- "//base/test:run_all_unittests",
- "//testing/gtest",
- "//third_party/icu:icuuc",
- ]
+ deps = [
+ ":url",
+ "//base:i18n",
+ "//base/test:run_all_unittests",
+ "//testing/gtest",
+ "//third_party/icu:icuuc",
+ ]
+ }
}
« no previous file with comments | « tools/gn/secondary/third_party/libevent/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698