Enable NativeActivity based Android tests.

build/apk_test.gypi

Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 6512b6d9f65573d7cef43aa406c7887f8125b0fe..0c8c0a0351a8f99b90c5c4f6a37d895bbc6fc2ed 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -27,19 +27,66 @@
     '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
   ],
   'conditions': [
-     ['OS == "android"', {
-       'variables': {
-         # These are used to configure java_apk.gypi included below.
-         'test_type': 'gtest',
-         'apk_name': '<(test_suite_name)',
-         'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
-         'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
-         'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
-         'native_lib_target': 'lib<(test_suite_name)',
-         # TODO(yfriedman, cjhopman): Support managed installs for gtests.
-         'gyp_managed_install': 0,
-       },
-       'includes': [ 'java_apk.gypi', 'android/test_runner.gypi' ],
-     }],  # 'OS == "android"
+    ['OS == "android"', {

[agrieve, 2016/05/19 00:42:50]

I don't think we need to update GYP for Android templates anymore. Unless
there's a reason we need GYP support for this, I think it'd be better to not
touch .gypi files.

[ynovikov, 2016/05/20 02:38:10]

Done.

+      'variables': {
+        # These are used to configure java_apk.gypi included below.
+        'test_type': 'gtest',
+        'apk_name': '<(test_suite_name)',
+        'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
+        'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
+        'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
+        'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja/AndroidManifest.xml',
+        'generated_src_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja', ],
+        'native_lib_target': 'lib<(test_suite_name)',
+        # TODO(yfriedman, cjhopman): Support managed installs for gtests.
+        'gyp_managed_install': 0,
+        'variables': {
+          'use_native_activity%': "false",
+        },
+        'use_native_activity%': '<(use_native_activity)',
+        'jinja_variables': [
+          'native_library_name=<(test_suite_name)',
+          'use_native_activity=<(use_native_activity)',
+        ],
+        'conditions': [
+          ['component == "shared_library"', {
+            'jinja_variables': [
+              'is_component_build=true',
+            ],
+          }, {
+            'jinja_variables': [
+              'is_component_build=false',
+            ],
+          }],
+        ],
+      },
+      'actions': [
+        {
+          'action_name': '<(_target_name)_manifest_jinja_template',
+          'message': 'processing manifest jinja template',
+          'inputs': [ '<(java_in_dir)/AndroidManifest.xml.jinja2', ],
+          'outputs': [ '<(android_manifest_path)' ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/jinja_template.py',
+            '--inputs', '<(java_in_dir)/AndroidManifest.xml.jinja2',
+            '--variables', '<(jinja_variables)',
+            '--output', '<(android_manifest_path)',
+          ],
+        },
+        {
+          'action_name': '<(_target_name)_activity_jinja_template',
+          'message': 'processing activity jinja template',
+          'inputs': [ '<(java_in_dir)/src/org/chromium/native_test/NativeTestActivity.java.jinja2', ],
+          'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja/org/chromium/native_test/NativeTestActivity.java' ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/jinja_template.py',
+            '--inputs', '<(java_in_dir)/src/org/chromium/native_test/NativeTestActivity.java.jinja2',
+            '--variables', '<(jinja_variables)',
+            '--output', '<(SHARED_INTERMEDIATE_DIR)/<(test_suite_name)_jinja/org/chromium/native_test/NativeTestActivity.java',
+          ],
+        },
+      ],
+      'includes': [ 'java_apk.gypi', 'android/test_runner.gypi' ],
+    }],  # 'OS == "android"
   ],  # conditions
 }