Android: Add testonly to test generate_jni() targets.
Previously this wasn't supported because there wasn't a separate
native library for test targets, and the non-test native library
wasn't allowed to depend on testonly targets.
TBR=agrieve # Trivial build refactor
Bug: 929661
Change-Id: I86d392758ffdfd4b30a3b94963d30f691731e326
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841759
Commit-Queue: Eric Stevenson <[email protected]>
Commit-Queue: Andrew Grieve <[email protected]>
Auto-Submit: Eric Stevenson <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Cr-Commit-Position: refs/heads/master@{#703006}
diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
index edcbb600..bdacdb57 100644
--- a/android_webview/test/BUILD.gn
+++ b/android_webview/test/BUILD.gn
@@ -337,6 +337,7 @@
}
generate_jni("webview_instrumentation_test_native_jni") {
+ testonly = true
sources = [
"../javatests/src/org/chromium/android_webview/test/MemoryMetricsLoggerTest.java",
]
@@ -424,6 +425,7 @@
}
generate_jni("android_webview_unittests_jni") {
+ testonly = true
sources = [
"../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java",
"../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
diff --git a/android_webview/test/embedded_test_server/BUILD.gn b/android_webview/test/embedded_test_server/BUILD.gn
index 297c3a8d..e6252b6 100644
--- a/android_webview/test/embedded_test_server/BUILD.gn
+++ b/android_webview/test/embedded_test_server/BUILD.gn
@@ -23,6 +23,7 @@
}
generate_jni("aw_net_jni_headers") {
+ testonly = true
sources = [
"java/src/org/chromium/android_webview/test/AwEmbeddedTestServerImpl.java",
]
diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index ad5af73d..53ea803 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -456,6 +456,7 @@
if (is_android) {
generate_jni("base_unittests_jni_headers") {
+ testonly = true
sources = [
"android/java/src/org/chromium/base/ContentUriTestUtils.java",
"android/java/src/org/chromium/base/JavaHandlerThreadHelpers.java",
@@ -463,6 +464,7 @@
}
generate_jni("test_support_jni_headers") {
+ testonly = true
sources = [
"android/java/src/org/chromium/base/MainReturnCodeResult.java",
"android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index c466072d8..54be7eb 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -1531,6 +1531,7 @@
]
generate_jni("test_support_jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java",
diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn
index 49c8c00..8e62f8e 100644
--- a/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chrome/android/features/autofill_assistant/BUILD.gn
@@ -164,6 +164,7 @@
}
generate_jni("test_support_jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantTestService.java",
]
diff --git a/chrome/browser/android/metrics/BUILD.gn b/chrome/browser/android/metrics/BUILD.gn
index cdb8fca..97f500d 100644
--- a/chrome/browser/android/metrics/BUILD.gn
+++ b/chrome/browser/android/metrics/BUILD.gn
@@ -19,6 +19,7 @@
}
generate_jni("jni_headers") {
+ testonly = true
sources = [
"../../../android/java/src/org/chromium/chrome/browser/metrics/UkmUtilsForTest.java",
]
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 22bd7ec..7aff2414 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -81,6 +81,7 @@
}
generate_jni("test_support_jni_headers") {
+ testonly = true
sources = [
"android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java",
]
diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
index 1d9ee84..2f17143 100644
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
@@ -11,6 +11,7 @@
}
generate_jni("test_support_jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java",
]
diff --git a/components/heap_profiling/BUILD.gn b/components/heap_profiling/BUILD.gn
index 19cada14..a00697c 100644
--- a/components/heap_profiling/BUILD.gn
+++ b/components/heap_profiling/BUILD.gn
@@ -25,6 +25,7 @@
if (is_android) {
generate_jni("jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/components/heap_profiling/HeapProfilingTestShim.java",
]
diff --git a/content/public/test/android/BUILD.gn b/content/public/test/android/BUILD.gn
index 4cd17c4..d2a6025e 100644
--- a/content/public/test/android/BUILD.gn
+++ b/content/public/test/android/BUILD.gn
@@ -2,6 +2,7 @@
import("//build/config/android/rules.gni")
generate_jni("test_support_content_jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/content_public/browser/test/NestedSystemMessageHandler.java",
]
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index c9e4a7c..fef7219 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2449,6 +2449,7 @@
]
generate_jni("content_unittests_jni_headers") {
+ testonly = true
sources = content_java_sources_needing_jni
}
diff --git a/device/BUILD.gn b/device/BUILD.gn
index ea1d749e5..3ddcd149 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -366,6 +366,7 @@
]
generate_jni("bluetooth_test_jni_headers") {
+ testonly = true
sources = bluetooth_java_sources_needing_jni
}
diff --git a/mojo/public/java/system/BUILD.gn b/mojo/public/java/system/BUILD.gn
index 2984d4b..b669abc7 100644
--- a/mojo/public/java/system/BUILD.gn
+++ b/mojo/public/java/system/BUILD.gn
@@ -14,6 +14,7 @@
}
generate_jni("jni_headers") {
+ testonly = true
sources = [
"javatests/src/org/chromium/mojo/MojoTestRule.java",
"javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java",
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 5b8409e9..82066908 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -3300,6 +3300,7 @@
]
}
generate_jni("net_test_jni_headers") {
+ testonly = true
sources = [
"android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
"android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index b6ee7181..9d2fc8a 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -77,6 +77,7 @@
}
generate_jni("native_test_jni_headers") {
+ testonly = true
sources = [
"java/src/org/chromium/native_test/MainRunner.java",
"java/src/org/chromium/native_test/NativeTest.java",
@@ -84,6 +85,7 @@
}
generate_jni("native_browser_test_jni_headers") {
+ testonly = true
sources = [
"java/src/org/chromium/native_test/NativeBrowserTest.java",
]
