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

Unified Diff: content/shell/BUILD.gn

Issue 2540603004: [Android] Redirect std{in,out,err} to sockets for layout tests. (Closed)
Patch Set: peter comments after layout_test_android -> scoped_android_configuration Created 4 years 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
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 2400fd203400e6d7e8e55b62646615b8bb64b6a5..9448c0c5c4e2aeb82ef92cc4c1895dd0a43f214f 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -58,8 +58,6 @@ static_library("content_shell_lib") {
"app/shell_main_delegate_mac.mm",
"browser/layout_test/blink_test_controller.cc",
"browser/layout_test/blink_test_controller.h",
- "browser/layout_test/layout_test_android.cc",
- "browser/layout_test/layout_test_android.h",
"browser/layout_test/layout_test_bluetooth_adapter_provider.cc",
"browser/layout_test/layout_test_bluetooth_adapter_provider.h",
"browser/layout_test/layout_test_bluetooth_chooser_factory.cc",
@@ -94,6 +92,8 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_resource_dispatcher_host_delegate.h",
"browser/layout_test/layout_test_url_request_context_getter.cc",
"browser/layout_test/layout_test_url_request_context_getter.h",
+ "browser/layout_test/scoped_android_configuration.cc",
+ "browser/layout_test/scoped_android_configuration.h",
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -312,7 +312,10 @@ static_library("content_shell_lib") {
}
if (is_android) {
- deps += [ "//content/shell/android:content_shell_jni_headers" ]
+ deps += [
+ "//base/test:test_support",
+ "//content/shell/android:content_shell_jni_headers",
+ ]
}
if (is_posix && !is_mac) {

Powered by Google App Engine
This is Rietveld 408576698