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

Side by Side Diff: base/BUILD.gn

Issue 1055703004: Move FilePathWatcher tests to base_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental changes, exclude Android for now. Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | base/base.gyp » ('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 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 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after
1108 "debug/debugger_unittest.cc", 1108 "debug/debugger_unittest.cc",
1109 "debug/leak_tracker_unittest.cc", 1109 "debug/leak_tracker_unittest.cc",
1110 "debug/proc_maps_linux_unittest.cc", 1110 "debug/proc_maps_linux_unittest.cc",
1111 "debug/stack_trace_unittest.cc", 1111 "debug/stack_trace_unittest.cc",
1112 "debug/task_annotator_unittest.cc", 1112 "debug/task_annotator_unittest.cc",
1113 "deferred_sequenced_task_runner_unittest.cc", 1113 "deferred_sequenced_task_runner_unittest.cc",
1114 "environment_unittest.cc", 1114 "environment_unittest.cc",
1115 "file_version_info_unittest.cc", 1115 "file_version_info_unittest.cc",
1116 "files/dir_reader_posix_unittest.cc", 1116 "files/dir_reader_posix_unittest.cc",
1117 "files/file_path_unittest.cc", 1117 "files/file_path_unittest.cc",
1118 "files/file_path_watcher_unittest.cc",
1118 "files/file_proxy_unittest.cc", 1119 "files/file_proxy_unittest.cc",
1119 "files/file_unittest.cc", 1120 "files/file_unittest.cc",
1120 "files/file_util_proxy_unittest.cc", 1121 "files/file_util_proxy_unittest.cc",
1121 "files/file_util_unittest.cc", 1122 "files/file_util_unittest.cc",
1122 "files/important_file_writer_unittest.cc", 1123 "files/important_file_writer_unittest.cc",
1123 "files/scoped_temp_dir_unittest.cc", 1124 "files/scoped_temp_dir_unittest.cc",
1124 "gmock_unittest.cc", 1125 "gmock_unittest.cc",
1125 "guid_unittest.cc", 1126 "guid_unittest.cc",
1126 "hash_unittest.cc", 1127 "hash_unittest.cc",
1127 "i18n/break_iterator_unittest.cc", 1128 "i18n/break_iterator_unittest.cc",
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 if (is_posix || is_ios) { 1367 if (is_posix || is_ios) {
1367 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1368 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1368 deps += [ "//third_party/libevent" ] 1369 deps += [ "//third_party/libevent" ]
1369 } 1370 }
1370 1371
1371 if (is_android) { 1372 if (is_android) {
1372 deps += [ "//testing/android/native_test:native_test_native_code" ] 1373 deps += [ "//testing/android/native_test:native_test_native_code" ]
1373 set_sources_assignment_filter([]) 1374 set_sources_assignment_filter([])
1374 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1375 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1375 set_sources_assignment_filter(sources_assignment_filter) 1376 set_sources_assignment_filter(sources_assignment_filter)
1377 sources -= [ "files/file_path_watcher_unittest.cc" ]
1376 } 1378 }
1377 1379
1378 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1380 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1379 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1381 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1380 } 1382 }
1381 1383
1382 if (is_android) { 1384 if (is_android) {
1383 # GYP: //base.gyp:base_jni_headers 1385 # GYP: //base.gyp:base_jni_headers
1384 generate_jni("base_jni_headers") { 1386 generate_jni("base_jni_headers") {
1385 sources = [ 1387 sources = [
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 1479
1478 # GYP: //base.gyp:base_java_unittest_support 1480 # GYP: //base.gyp:base_java_unittest_support
1479 android_library("base_java_unittest_support") { 1481 android_library("base_java_unittest_support") {
1480 deps = [ 1482 deps = [
1481 ":base_java", 1483 ":base_java",
1482 ] 1484 ]
1483 java_files = 1485 java_files =
1484 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1486 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1485 } 1487 }
1486 } 1488 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698