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

Side by Side Diff: chrome/test/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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 "//v8", 1246 "//v8",
1247 ] 1247 ]
1248 } 1248 }
1249 1249
1250 if (is_android) { 1250 if (is_android) {
1251 deps -= [ "//third_party/libaddressinput" ] 1251 deps -= [ "//third_party/libaddressinput" ]
1252 1252
1253 # Some android targets still depend on --gc-sections to link. 1253 # Some android targets still depend on --gc-sections to link.
1254 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). 1254 # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
1255 ldflags = [ "-Wl,--gc-sections" ] 1255 ldflags = [ "-Wl,--gc-sections" ]
1256 deps += [ "//testing/android:native_test_native_code" ] 1256 deps += [ "//testing/android/native_test:native_test_native_code" ]
1257 } else { 1257 } else {
1258 sources += 1258 sources +=
1259 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, 1259 rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources,
1260 ".", 1260 ".",
1261 "//chrome") 1261 "//chrome")
1262 } 1262 }
1263 1263
1264 if (is_ios || is_chromeos) { 1264 if (is_ios || is_chromeos) {
1265 sources -= 1265 sources -=
1266 [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ] 1266 [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ]
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 } 1748 }
1749 1749
1750 if (cld_version == 0 || cld_version == 2) { 1750 if (cld_version == 0 || cld_version == 2) {
1751 # Use whatever CLD2 data access mode that the 1751 # Use whatever CLD2 data access mode that the
1752 # application embedder is using. 1752 # application embedder is using.
1753 deps += [ "//third_party/cld_2:cld2_platform_impl" ] 1753 deps += [ "//third_party/cld_2:cld2_platform_impl" ]
1754 } 1754 }
1755 } 1755 }
1756 } 1756 }
1757 } 1757 }
OLDNEW
« no previous file with comments | « build/apk_test.gypi ('k') | content/shell/android/browsertests_apk/content_browser_tests_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698