Index: chrome/android/BUILD.gn |
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn |
index cd88626c5a873a15be3a13e5324521758d1d14e1..8f94c4aaab0b956881f449d1fa134f7cd2b4876c 100644 |
--- a/chrome/android/BUILD.gn |
+++ b/chrome/android/BUILD.gn |
@@ -486,10 +486,14 @@ instrumentation_test_apk("chrome_shell_test_apk") { |
deps = [ |
":chrome_javatests", |
":chrome_shell_test_java", |
+ |
+ # ChromeShellTest uses ChromePublicTest's native library. |
+ ":chrome_public_test", |
] |
apk_name = "ChromeShellTest" |
android_manifest = "shell/javatests/AndroidManifest.xml" |
isolate_file = "../chrome_shell_test_apk.isolate" |
+ native_libs = [ "$root_build_dir/lib.stripped/libchrome_public_test.so" ] |
} |
# GYP: //chrome/chrome_tests.gypi:chrome_junit_tests |
@@ -724,6 +728,16 @@ android_apk("chrome_public_apk") { |
] |
} |
+shared_library("chrome_public_test") { |
+ testonly = true |
+ deps = [ |
+ "//net:test_support", |
+ ] |
+ sources = [ |
+ "../browser/android/chrome_test_entry_point.cc", |
+ ] |
+} |
+ |
chrome_public_test_apk_manifest = |
"$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml" |
@@ -741,8 +755,10 @@ instrumentation_test_apk("chrome_public_test_apk") { |
apk_under_test = ":chrome_public_apk" |
android_manifest = chrome_public_test_apk_manifest |
deps = [ |
+ ":chrome_public_test", |
":chrome_public_test_apk_manifest", |
"//chrome/android:chrome_shared_test_java", |
] |
isolate_file = "../chrome_public_test_apk.isolate" |
+ native_libs = [ "$root_build_dir/lib.stripped/libchrome_public_test.so" ] |
} |