OLD | NEW |
---|---|
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
7 | 7 |
8 if (is_android) { | 8 if (is_android) { |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
490 "task/cancelable_task_tracker.h", | 490 "task/cancelable_task_tracker.h", |
491 "task_runner.cc", | 491 "task_runner.cc", |
492 "task_runner.h", | 492 "task_runner.h", |
493 "task_runner_util.h", | 493 "task_runner_util.h", |
494 "template_util.h", | 494 "template_util.h", |
495 "third_party/dmg_fp/dmg_fp.h", | 495 "third_party/dmg_fp/dmg_fp.h", |
496 "third_party/dmg_fp/dtoa_wrapper.cc", | 496 "third_party/dmg_fp/dtoa_wrapper.cc", |
497 "third_party/dmg_fp/g_fmt.cc", | 497 "third_party/dmg_fp/g_fmt.cc", |
498 "third_party/icu/icu_utf.cc", | 498 "third_party/icu/icu_utf.cc", |
499 "third_party/icu/icu_utf.h", | 499 "third_party/icu/icu_utf.h", |
500 "third_party/nspr/prtime.cc", | |
501 "third_party/nspr/prtime.h", | |
500 "third_party/superfasthash/superfasthash.c", | 502 "third_party/superfasthash/superfasthash.c", |
501 "thread_task_runner_handle.cc", | 503 "thread_task_runner_handle.cc", |
502 "thread_task_runner_handle.h", | 504 "thread_task_runner_handle.h", |
503 "threading/non_thread_safe.h", | 505 "threading/non_thread_safe.h", |
504 "threading/non_thread_safe_impl.cc", | 506 "threading/non_thread_safe_impl.cc", |
505 "threading/non_thread_safe_impl.h", | 507 "threading/non_thread_safe_impl.h", |
506 "threading/platform_thread.h", | 508 "threading/platform_thread.h", |
507 "threading/platform_thread_android.cc", | 509 "threading/platform_thread_android.cc", |
508 "threading/platform_thread_internal_posix.cc", | 510 "threading/platform_thread_internal_posix.cc", |
509 "threading/platform_thread_internal_posix.h", | 511 "threading/platform_thread_internal_posix.h", |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
633 "sys_info_freebsd.cc", | 635 "sys_info_freebsd.cc", |
634 "sys_info_openbsd.cc", | 636 "sys_info_openbsd.cc", |
635 ] | 637 ] |
636 | 638 |
637 configs += [ ":base_implementation" ] | 639 configs += [ ":base_implementation" ] |
638 | 640 |
639 deps = [ | 641 deps = [ |
640 ":base_static", | 642 ":base_static", |
641 "//base/allocator:allocator_extension_thunks", | 643 "//base/allocator:allocator_extension_thunks", |
642 "//base/third_party/dynamic_annotations", | 644 "//base/third_party/dynamic_annotations", |
643 "//base/third_party/nspr", | |
644 "//third_party/modp_b64", | 645 "//third_party/modp_b64", |
645 ] | 646 ] |
646 | 647 |
647 public_deps = [ | 648 public_deps = [ |
648 ":base_paths", | 649 ":base_paths", |
649 "//base/debug", | 650 "//base/debug", |
650 "//base/json", | 651 "//base/json", |
651 "//base/memory", | 652 "//base/memory", |
652 "//base/metrics", | 653 "//base/metrics", |
653 "//base/process", | 654 "//base/process", |
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1300 deps = [ | 1301 deps = [ |
1301 ":base", | 1302 ":base", |
1302 ":i18n", | 1303 ":i18n", |
1303 ":message_loop_tests", | 1304 ":message_loop_tests", |
1304 ":prefs", | 1305 ":prefs", |
1305 ":prefs_test_support", | 1306 ":prefs_test_support", |
1306 "//base/allocator", | 1307 "//base/allocator", |
1307 "//base/test:run_all_unittests", | 1308 "//base/test:run_all_unittests", |
1308 "//base/test:test_support", | 1309 "//base/test:test_support", |
1309 "//base/third_party/dynamic_annotations", | 1310 "//base/third_party/dynamic_annotations", |
1310 "//base/third_party/nspr", | |
cjhopman
2015/04/16 19:02:18
I think that this line is actually the problem wit
Dirk Pranke
2015/04/16 20:31:52
//base:base can't depend on nspr, because nspr dep
cjhopman
2015/04/16 20:50:33
That's not true. Before your change nspr didn't ha
Dirk Pranke
2015/04/16 20:59:32
Well, yeah, it didn't have an explicit dependency
cjhopman
2015/04/16 21:03:47
Folding it in is definitely fine with me.
It seem
| |
1311 "//base/trace_event:trace_event_unittests", | 1311 "//base/trace_event:trace_event_unittests", |
1312 "//testing/gmock", | 1312 "//testing/gmock", |
1313 "//testing/gtest", | 1313 "//testing/gtest", |
1314 "//third_party/icu", | 1314 "//third_party/icu", |
1315 ] | 1315 ] |
1316 | 1316 |
1317 # Allow more direct string conversions on platforms with native utf8 | 1317 # Allow more direct string conversions on platforms with native utf8 |
1318 # strings | 1318 # strings |
1319 if (is_mac || is_ios || is_chromeos) { | 1319 if (is_mac || is_ios || is_chromeos) { |
1320 defines = [ "SYSTEM_NATIVE_UTF8" ] | 1320 defines = [ "SYSTEM_NATIVE_UTF8" ] |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1479 | 1479 |
1480 # GYP: //base.gyp:base_java_unittest_support | 1480 # GYP: //base.gyp:base_java_unittest_support |
1481 android_library("base_java_unittest_support") { | 1481 android_library("base_java_unittest_support") { |
1482 deps = [ | 1482 deps = [ |
1483 ":base_java", | 1483 ":base_java", |
1484 ] | 1484 ] |
1485 java_files = | 1485 java_files = |
1486 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1486 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
1487 } | 1487 } |
1488 } | 1488 } |
OLD | NEW |