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

Unified Diff: net/BUILD.gn

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed require_net_test_support_apk comment Created 5 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: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index c874097414682c4d14d7f8f1c6d4c977316daf22..9756aa905fde19f90023217590a37a649f11b711 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -676,7 +676,13 @@ source_set("test_support") {
}
if (is_android) {
+ public_deps += [ ":net_test_jni_headers" ]
sources += [
+ "test/android/net_test_entry_point.cc",
+ "test/android/net_test_jni_onload.cc",
+ "test/android/net_test_jni_onload.h",
+ "test/embedded_test_server/android/embedded_test_server_android.cc",
+ "test/embedded_test_server/android/embedded_test_server_android.h",
"test/spawned_test_server/remote_test_server.cc",
"test/spawned_test_server/remote_test_server.h",
"test/spawned_test_server/spawner_communicator.cc",
@@ -1209,7 +1215,7 @@ if (is_android) {
sources = [
"android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
"test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
- "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
+ "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
]
jni_package = "net/test"
}

Powered by Google App Engine
This is Rietveld 408576698