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

Side by Side Diff: base/BUILD.gn

Issue 1071573003: [Android] Move testing/android/ to testing/android/native_test/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing errant commit 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 | build/apk_test.gypi » ('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 892 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 ] 903 ]
904 deps = [ 904 deps = [
905 ":base", 905 ":base",
906 "//base/test:test_support", 906 "//base/test:test_support",
907 "//base/test:test_support_perf", 907 "//base/test:test_support_perf",
908 "//testing/perf", 908 "//testing/perf",
909 "//testing/gtest", 909 "//testing/gtest",
910 ] 910 ]
911 911
912 if (is_android) { 912 if (is_android) {
913 deps += [ "//testing/android:native_test_native_code" ] 913 deps += [ "//testing/android/native_test:native_test_native_code" ]
914 } 914 }
915 } 915 }
916 916
917 test("base_i18n_perftests") { 917 test("base_i18n_perftests") {
918 sources = [ 918 sources = [
919 "i18n/streaming_utf8_validator_perftest.cc", 919 "i18n/streaming_utf8_validator_perftest.cc",
920 ] 920 ]
921 deps = [ 921 deps = [
922 ":base", 922 ":base",
923 ":i18n", 923 ":i18n",
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 if (!is_linux || use_ozone) { 1360 if (!is_linux || use_ozone) {
1361 sources -= [ "message_loop/message_pump_glib_unittest.cc" ] 1361 sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
1362 } 1362 }
1363 1363
1364 if (is_posix || is_ios) { 1364 if (is_posix || is_ios) {
1365 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1365 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1366 deps += [ "//third_party/libevent" ] 1366 deps += [ "//third_party/libevent" ]
1367 } 1367 }
1368 1368
1369 if (is_android) { 1369 if (is_android) {
1370 deps += [ "//testing/android:native_test_native_code" ] 1370 deps += [ "//testing/android/native_test:native_test_native_code" ]
1371 set_sources_assignment_filter([]) 1371 set_sources_assignment_filter([])
1372 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1372 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1373 set_sources_assignment_filter(sources_assignment_filter) 1373 set_sources_assignment_filter(sources_assignment_filter)
1374 } 1374 }
1375 1375
1376 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1376 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1377 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1377 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1378 } 1378 }
1379 1379
1380 if (is_android) { 1380 if (is_android) {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 1474
1475 # GYP: //base.gyp:base_java_unittest_support 1475 # GYP: //base.gyp:base_java_unittest_support
1476 android_library("base_java_unittest_support") { 1476 android_library("base_java_unittest_support") {
1477 deps = [ 1477 deps = [
1478 ":base_java", 1478 ":base_java",
1479 ] 1479 ]
1480 java_files = 1480 java_files =
1481 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1481 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1482 } 1482 }
1483 } 1483 }
OLDNEW
« no previous file with comments | « no previous file | build/apk_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698