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

Side by Side Diff: base/BUILD.gn

Issue 1087503003: Enable FilePathWatcher base unittests on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improve comments 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 1356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 if (is_posix || is_ios) { 1367 if (is_posix || is_ios) {
1368 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1368 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1369 deps += [ "//third_party/libevent" ] 1369 deps += [ "//third_party/libevent" ]
1370 } 1370 }
1371 1371
1372 if (is_android) { 1372 if (is_android) {
1373 deps += [ "//testing/android/native_test:native_test_native_code" ] 1373 deps += [ "//testing/android/native_test:native_test_native_code" ]
1374 set_sources_assignment_filter([]) 1374 set_sources_assignment_filter([])
1375 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1375 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1376 set_sources_assignment_filter(sources_assignment_filter) 1376 set_sources_assignment_filter(sources_assignment_filter)
1377 sources -= [ "files/file_path_watcher_unittest.cc" ]
1378 } 1377 }
1379 1378
1380 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1379 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1381 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1380 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1382 } 1381 }
1383 1382
1384 if (is_android) { 1383 if (is_android) {
1385 # GYP: //base.gyp:base_jni_headers 1384 # GYP: //base.gyp:base_jni_headers
1386 generate_jni("base_jni_headers") { 1385 generate_jni("base_jni_headers") {
1387 sources = [ 1386 sources = [
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 1478
1480 # GYP: //base.gyp:base_java_unittest_support 1479 # GYP: //base.gyp:base_java_unittest_support
1481 android_library("base_java_unittest_support") { 1480 android_library("base_java_unittest_support") {
1482 deps = [ 1481 deps = [
1483 ":base_java", 1482 ":base_java",
1484 ] 1483 ]
1485 java_files = 1484 java_files =
1486 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1485 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1487 } 1486 }
1488 } 1487 }
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