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

Unified Diff: base/test/BUILD.gn

Issue 2611323002: Relanding "Multiprocess test client: Android child process launcher rework." (Closed)
Patch Set: Addressed nyquist@'s comment + sync Created 3 years, 11 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 | « base/process/process_win.cc ('k') | base/test/android/java/src/org/chromium/base/FileDescriptorInfo.aidl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/BUILD.gn
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 44d8c29ac3f42b99e4a12e960e7c7f64960b0aa0..265ef44a9a7e0d29f3f839f7f7d2c7e5cc3a4b8c 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -56,7 +56,9 @@ static_library("test_support") {
"mock_entropy_provider.h",
"mock_log.cc",
"mock_log.h",
+ "multiprocess_test.cc",
"multiprocess_test.h",
+ "multiprocess_test_android.cc",
"null_task_runner.cc",
"null_task_runner.h",
"opaque_ref_counted.cc",
@@ -148,8 +150,6 @@ static_library("test_support") {
"launcher/test_launcher_tracer.h",
"launcher/test_results_tracker.cc",
"launcher/unit_test_launcher.cc",
- "multiprocess_test.cc",
- "multiprocess_test_android.cc",
]
}
@@ -193,7 +193,11 @@ static_library("test_support") {
}
if (is_android) {
- deps += [ ":base_unittests_jni_headers" ]
+ deps += [
+ ":base_unittests_jni_headers",
+ ":test_support_jni_headers",
+ ]
+ public_deps += [ ":test_support_java" ]
}
if (is_nacl_nonsfi) {
@@ -329,4 +333,42 @@ if (is_android) {
]
jni_package = "base"
}
+
+ generate_jni("test_support_jni_headers") {
+ sources = [
+ "android/java/src/org/chromium/base/MainReturnCodeResult.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
+ ]
+ jni_package = "base"
+ }
+
+ android_library("test_support_java") {
+ testonly = true
+ deps = [
+ "//base:base_java",
+ "//testing/android/native_test:native_main_runner_java",
+ "//third_party/android_tools:android_support_annotations_java",
+ "//third_party/jsr-305:jsr_305_javalib",
+ ]
+ srcjar_deps = [ ":test_support_java_aidl" ]
+ java_files = [
+ "android/java/src/org/chromium/base/FileDescriptorInfo.java",
+ "android/java/src/org/chromium/base/MainReturnCodeResult.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
+ "android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
+ ]
+ }
+
+ android_aidl("test_support_java_aidl") {
+ testonly = true
+ import_include = "android/java/src"
+ sources = [
+ "android/java/src/org/chromium/base/ITestClient.aidl",
+ ]
+ }
}
« no previous file with comments | « base/process/process_win.cc ('k') | base/test/android/java/src/org/chromium/base/FileDescriptorInfo.aidl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698