[Android] Refactor the native test wrappers. (RELAND)

testing/android/native_test/BUILD.gn

Index: testing/android/native_test/BUILD.gn
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index 5df47fd2bd1f9ca7ebbb61806d51b9378769afe5..0e8ffcb581b7f55d904baa0697845278eca51d67 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -4,18 +4,17 @@
 
 import("//build/config/android/rules.gni")
 
-# GYP: //testing/android/native_test.gyp:native_test_native_code
-source_set("native_test_native_code") {
+# GYP: //testing/android/native_test.gyp:native_test_support
+source_set("native_test_support") {
   testonly = true
   sources = [
-    "native_test_jni_onload.cc",
     "native_test_launcher.cc",
     "native_test_launcher.h",
+    "native_test_util.cc",
+    "native_test_util.h",
   ]
-  libs = [ "log" ]
   deps = [
     ":native_test_jni_headers",
-    ":native_test_util",
     "//base",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
@@ -23,21 +22,23 @@ source_set("native_test_native_code") {
   ]
 }
 
-# GYP: //testing/android/native_test.gyp:native_test_jni_headers
-generate_jni("native_test_jni_headers") {
+# GYP: //testing/android/native_test.gyp:native_test_native_code
+source_set("native_test_native_code") {
+  testonly = true
   sources = [
-    "java/src/org/chromium/native_test/NativeTestActivity.java",
+    "native_test_jni_onload.cc",
+  ]
+  libs = [ "log" ]
+  deps = [
+    ":native_test_support",
+    "//base",
   ]
-  jni_package = "testing"
 }
 
-# GYP: //testing/android/native_test.gyp:native_test_util
-source_set("native_test_util") {
+# GYP: //testing/android/native_test.gyp:native_test_jni_headers
+generate_jni("native_test_jni_headers") {
   sources = [
-    "native_test_util.cc",
-    "native_test_util.h",
-  ]
-  deps = [
-    "//base",
+    "java/src/org/chromium/native_test/NativeTestActivity.java",
   ]
+  jni_package = "testing"
 }