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

testing/android/native_test.gyp

Index: testing/android/native_test.gyp
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 5993c43a9fd98e7c649c363fc4d6c31aab7ba0fd..fcfd7d7028dff816af7d4d1da05d44d6ec2a6af2 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -7,14 +7,27 @@
     ['OS=="android"', {
       'targets': [
         {
-          # GN: //testing/android:native_test_native_code
-          'target_name': 'native_test_native_code',
+          # GN: //testing/android:native_test_jni_headers
+          'target_name': 'native_test_jni_headers',
+          'type': 'none',
+          'sources': [
+            'native_test/java/src/org/chromium/native_test/NativeTestActivity.java'
+          ],
+          'variables': {
+            'jni_gen_package': 'testing',
+          },
+          'includes': [ '../../build/jni_generator.gypi' ],
+        },
+        {
+          # GN: //testing/android:native_test_support
+          'target_name': 'native_test_support',
           'message': 'building native pieces of native test package',
           'type': 'static_library',
           'sources': [
-            'native_test/native_test_jni_onload.cc',
             'native_test/native_test_launcher.cc',
             'native_test/native_test_launcher.h',
+            'native_test/native_test_util.cc',
+            'native_test/native_test_util.h',
           ],
           'dependencies': [
             '../../base/base.gyp:base',
@@ -22,33 +35,36 @@
             '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gtest.gyp:gtest',
             'native_test_jni_headers',
-            'native_test_util',
           ],
         },
         {
-          # GN: //testing/android:native_test_jni_headers
-          'target_name': 'native_test_jni_headers',
-          'type': 'none',
-          'sources': [
-            'native_test/java/src/org/chromium/native_test/NativeTestActivity.java'
-          ],
-          'variables': {
-            'jni_gen_package': 'testing',
-          },
-          'includes': [ '../../build/jni_generator.gypi' ],
-        },
-        {
-          # GN: //testing/android:native_test_util
-          'target_name': 'native_test_util',
+          # GN: //testing/android:native_test_native_code
+          'target_name': 'native_test_native_code',
+          'message': 'building JNI onload for native test package',
           'type': 'static_library',
           'sources': [
-            'native_test/native_test_util.cc',
-            'native_test/native_test_util.h',
+            'native_test/native_test_jni_onload.cc',
           ],
           'dependencies': [
+            'native_test_support',
             '../../base/base.gyp:base',
           ],
         },
+        {
+          'target_name': 'native_test_java',
+          'type': 'none',
+          'dependencies': [
+            'appurify_support.gyp:appurify_support_java',
+            '../../base/base.gyp:base_native_libraries_gen',
+            '../../base/base.gyp:base_java',
+          ],
+          'variables': {
+            'chromium_code': '1',
+            'jar_excluded_classes': [ '*/NativeLibraries.class' ],
+            'java_in_dir': 'native_test/java',
+          },
+          'includes': [ '../../build/java.gypi' ],
+        },
       ],
     }]
   ],