Chromium Code Reviews| 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 # HOW TO WRITE CONDITIONALS IN THIS FILE | 5 # HOW TO WRITE CONDITIONALS IN THIS FILE |
| 6 # ====================================== | 6 # ====================================== |
| 7 # | 7 # |
| 8 # In many other places, one would write a conditional that expresses all the | 8 # In many other places, one would write a conditional that expresses all the |
| 9 # cases when a source file is used or unused, and then either add or subtract | 9 # cases when a source file is used or unused, and then either add or subtract |
| 10 # it from the sources list in that case | 10 # it from the sources list in that case |
| (...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 950 ":base_implementation", | 950 ":base_implementation", |
| 951 "//base/allocator:allocator_shim_define", # for allocator_check.cc. | 951 "//base/allocator:allocator_shim_define", # for allocator_check.cc. |
| 952 "//build/config:precompiled_headers", | 952 "//build/config:precompiled_headers", |
| 953 ] | 953 ] |
| 954 | 954 |
| 955 deps = [ | 955 deps = [ |
| 956 "//base/third_party/dynamic_annotations", | 956 "//base/third_party/dynamic_annotations", |
| 957 "//third_party/modp_b64", | 957 "//third_party/modp_b64", |
| 958 ] | 958 ] |
| 959 | 959 |
| 960 if (!is_nacl) { | |
|
brettw
2016/01/19 20:20:33
I think the allocator should never be used in nacl
Primiano Tucci (use gerrit)
2016/01/20 14:11:43
Right.
| |
| 961 deps += [ "//base/allocator" ] | |
| 962 } | |
| 963 | |
| 960 public_deps = [ | 964 public_deps = [ |
| 961 ":base_paths", | 965 ":base_paths", |
| 962 ":base_static", | 966 ":base_static", |
| 963 ":debugging_flags", | 967 ":debugging_flags", |
| 964 ] | 968 ] |
| 965 | 969 |
| 966 # Allow more direct string conversions on platforms with native utf8 | 970 # Allow more direct string conversions on platforms with native utf8 |
| 967 # strings | 971 # strings |
| 968 if (is_mac || is_ios || is_chromeos) { | 972 if (is_mac || is_ios || is_chromeos) { |
| 969 defines += [ "SYSTEM_NATIVE_UTF8" ] | 973 defines += [ "SYSTEM_NATIVE_UTF8" ] |
| (...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1857 "win/win_util_unittest.cc", | 1861 "win/win_util_unittest.cc", |
| 1858 "win/wrapped_window_proc_unittest.cc", | 1862 "win/wrapped_window_proc_unittest.cc", |
| 1859 ] | 1863 ] |
| 1860 | 1864 |
| 1861 deps = [ | 1865 deps = [ |
| 1862 ":base", | 1866 ":base", |
| 1863 ":i18n", | 1867 ":i18n", |
| 1864 ":message_loop_tests", | 1868 ":message_loop_tests", |
| 1865 ":prefs", | 1869 ":prefs", |
| 1866 ":prefs_test_support", | 1870 ":prefs_test_support", |
| 1867 "//base/allocator", | |
| 1868 "//base/test:run_all_unittests", | 1871 "//base/test:run_all_unittests", |
| 1869 "//base/test:test_support", | 1872 "//base/test:test_support", |
| 1870 "//base/third_party/dynamic_annotations", | 1873 "//base/third_party/dynamic_annotations", |
| 1871 "//testing/gmock", | 1874 "//testing/gmock", |
| 1872 "//testing/gtest", | 1875 "//testing/gtest", |
| 1873 "//third_party/icu", | 1876 "//third_party/icu", |
| 1874 ] | 1877 ] |
| 1875 | 1878 |
| 1879 # Some unittests depend on the ALLOCATOR_SHIM macro. | |
| 1880 configs += [ "//base/allocator:allocator_shim_define" ] | |
| 1881 | |
| 1876 data = [ | 1882 data = [ |
| 1877 "test/data/", | 1883 "test/data/", |
| 1878 ] | 1884 ] |
| 1879 | 1885 |
| 1880 # Allow more direct string conversions on platforms with native utf8 | 1886 # Allow more direct string conversions on platforms with native utf8 |
| 1881 # strings | 1887 # strings |
| 1882 if (is_mac || is_ios || is_chromeos) { | 1888 if (is_mac || is_ios || is_chromeos) { |
| 1883 defines = [ "SYSTEM_NATIVE_UTF8" ] | 1889 defines = [ "SYSTEM_NATIVE_UTF8" ] |
| 1884 } | 1890 } |
| 1885 | 1891 |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2143 | 2149 |
| 2144 # GYP: //base.gyp:base_java_unittest_support | 2150 # GYP: //base.gyp:base_java_unittest_support |
| 2145 android_library("base_java_unittest_support") { | 2151 android_library("base_java_unittest_support") { |
| 2146 deps = [ | 2152 deps = [ |
| 2147 ":base_java", | 2153 ":base_java", |
| 2148 ] | 2154 ] |
| 2149 java_files = | 2155 java_files = |
| 2150 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 2156 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 2151 } | 2157 } |
| 2152 } | 2158 } |
| OLD | NEW |