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

Unified Diff: content/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/android/browsertests_apk/content_browser_tests_android.cc ('k') | gpu/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index a34cd5c5eeada7c57fba89982d782edc85432f8f..b26c93e520acb9b1d3dad00fdfccdaf5cc19aca7 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -370,7 +370,7 @@ if (!is_mac) {
deps += [
"//content/shell/android:content_shell_jni_headers",
"//content/shell:content_shell_lib",
- "//testing/android:native_test_util",
+ "//testing/android/native_test:native_test_util",
]
use_launcher = false
@@ -584,7 +584,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links.
"../browser/geolocation/wifi_data_provider_common_unittest.cc",
"../browser/webui/url_data_manager_backend_unittest.cc",
]
- deps += [ "//testing/android:native_test_native_code" ]
+ deps += [ "//testing/android/native_test:native_test_native_code" ]
}
if (!is_android && !is_ios) {
deps += [ "//third_party/libvpx" ]
@@ -657,7 +657,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links.
]
if (is_android) {
- deps += [ "//testing/android:native_test_native_code" ]
+ deps += [ "//testing/android/native_test:native_test_native_code" ]
}
}
@@ -684,7 +684,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links.
]
if (is_android) {
- deps += [ "//testing/android:native_test_native_code" ]
+ deps += [ "//testing/android/native_test:native_test_native_code" ]
} else {
data_deps = [
"//third_party/ffmpeg",
« no previous file with comments | « content/shell/android/browsertests_apk/content_browser_tests_android.cc ('k') | gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698