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

Side by Side Diff: base/BUILD.gn

Issue 1610673002: Revert of Allow base to depend on allocator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 data = [] 944 data = []
945 945
946 configs += [ 946 configs += [
947 ":base_flags", 947 ":base_flags",
948 ":base_implementation", 948 ":base_implementation",
949 "//base/allocator:allocator_shim_define", # for allocator_check.cc. 949 "//base/allocator:allocator_shim_define", # for allocator_check.cc.
950 "//build/config:precompiled_headers", 950 "//build/config:precompiled_headers",
951 ] 951 ]
952 952
953 deps = [ 953 deps = [
954 "//base/allocator",
955 "//base/third_party/dynamic_annotations", 954 "//base/third_party/dynamic_annotations",
956 "//third_party/modp_b64", 955 "//third_party/modp_b64",
957 ] 956 ]
958 957
959 public_deps = [ 958 public_deps = [
960 ":base_paths", 959 ":base_paths",
961 ":base_static", 960 ":base_static",
962 ":debugging_flags", 961 ":debugging_flags",
963 ] 962 ]
964 963
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
1852 "win/win_util_unittest.cc", 1851 "win/win_util_unittest.cc",
1853 "win/wrapped_window_proc_unittest.cc", 1852 "win/wrapped_window_proc_unittest.cc",
1854 ] 1853 ]
1855 1854
1856 deps = [ 1855 deps = [
1857 ":base", 1856 ":base",
1858 ":i18n", 1857 ":i18n",
1859 ":message_loop_tests", 1858 ":message_loop_tests",
1860 ":prefs", 1859 ":prefs",
1861 ":prefs_test_support", 1860 ":prefs_test_support",
1861 "//base/allocator",
1862 "//base/test:run_all_unittests", 1862 "//base/test:run_all_unittests",
1863 "//base/test:test_support", 1863 "//base/test:test_support",
1864 "//base/third_party/dynamic_annotations", 1864 "//base/third_party/dynamic_annotations",
1865 "//testing/gmock", 1865 "//testing/gmock",
1866 "//testing/gtest", 1866 "//testing/gtest",
1867 "//third_party/icu", 1867 "//third_party/icu",
1868 ] 1868 ]
1869 1869
1870 # Some unittests depend on the ALLOCATOR_SHIM macro.
1871 configs += [ "//base/allocator:allocator_shim_define" ]
1872
1873 data = [ 1870 data = [
1874 "test/data/", 1871 "test/data/",
1875 ] 1872 ]
1876 1873
1877 # Allow more direct string conversions on platforms with native utf8 1874 # Allow more direct string conversions on platforms with native utf8
1878 # strings 1875 # strings
1879 if (is_mac || is_ios || is_chromeos) { 1876 if (is_mac || is_ios || is_chromeos) {
1880 defines = [ "SYSTEM_NATIVE_UTF8" ] 1877 defines = [ "SYSTEM_NATIVE_UTF8" ]
1881 } 1878 }
1882 1879
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
2135 2132
2136 # GYP: //base.gyp:base_java_unittest_support 2133 # GYP: //base.gyp:base_java_unittest_support
2137 android_library("base_java_unittest_support") { 2134 android_library("base_java_unittest_support") {
2138 deps = [ 2135 deps = [
2139 ":base_java", 2136 ":base_java",
2140 ] 2137 ]
2141 java_files = 2138 java_files =
2142 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 2139 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
2143 } 2140 }
2144 } 2141 }
OLDNEW
« no previous file with comments | « no previous file | base/allocator/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698