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

Unified Diff: net/android/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: agrieve comments Created 5 years, 1 month 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/android/BUILD.gn
diff --git a/net/android/BUILD.gn b/net/android/BUILD.gn
index df00495ad2559cac5051f948d7f59693529e7c95..b8232482e48306cc0e4717c75e03481be9d01475 100644
--- a/net/android/BUILD.gn
+++ b/net/android/BUILD.gn
@@ -26,14 +26,47 @@ android_aidl("remote_android_keystore_aidl") {
]
}
+android_aidl("embedded_test_server_aidl") {
+ interface_file = "../test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerInterface.aidl"
+ sources = [
+ "../test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl.aidl",
+ ]
+}
+
android_library("net_java_test_support") {
+ testonly = true
DEPRECATED_java_in_dir = "../test/android/javatests/src"
deps = [
":net_java",
"//base:base_java",
+ "//base:base_java_test_support",
"//third_party/android_tools:legacy_http_javalib",
]
- srcjar_deps = [ ":net_java_test_support_enums_srcjar" ]
+ srcjar_deps = [
+ ":embedded_test_server_aidl",
+ ":net_java_test_support_enums_srcjar",
+ ]
+}
+
+shared_library("net_java_test_native_support") {
+ testonly = true
+ deps = [
+ "//net:test_support",
+ ]
+}
+
+android_apk("net_test_support_apk") {
+ testonly = true
+ deps = [
+ ":net_java_test_native_support",
+ ":net_java_test_support",
+ "//base:base_java",
+ ]
+ android_manifest = "../test/android/javatests/AndroidManifest.xml"
+ apk_name = "ChromiumNetTestSupport"
+ native_libs = [ "libnet_java_test_native_support.so" ]
+ native_libraries_template =
+ "//base/test/android/java/templates/NativeTestLibraries.template"
}
android_resources("net_unittests_apk_resources") {
@@ -42,6 +75,7 @@ android_resources("net_unittests_apk_resources") {
}
android_library("net_javatests") {
+ testonly = true
DEPRECATED_java_in_dir = "javatests/src"
deps = [
":net_java",

Powered by Google App Engine
This is Rietveld 408576698