Use tests tag for Skia tools on Android.

When generating the makefiles for Skia testing tools on Android,
use the tag 'tests' and do not use the tags 'optional' or 'eng'.

R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/315013003

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index cf4f782..d79fd4a 100755 (executable)
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -133,7 +133,7 @@ def main(target_dir=None, require_sk_user_config=False):
                                        dest_dir='tests',
                                        skia_lib_var_dict=common,
                                        local_module_name='skia_test',
-                                       local_module_tags=['eng', 'tests'])
+                                       local_module_tags=['tests'])
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='bench.gyp',
@@ -150,7 +150,7 @@ def main(target_dir=None, require_sk_user_config=False):
                                        dest_dir='gm',
                                        skia_lib_var_dict=common,
                                        local_module_name='skia_gm',
-                                       local_module_tags=['optional'])
+                                       local_module_tags=['tests'])
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='dm.gyp',
@@ -158,7 +158,7 @@ def main(target_dir=None, require_sk_user_config=False):
                                        dest_dir='dm',
                                        skia_lib_var_dict=common,
                                        local_module_name='skia_dm',
-                                       local_module_tags=['optional'])
+                                       local_module_tags=['tests'])
 
     # Now that the defines have been written to SkUserConfig and they've been
     # used to skip adding them to the tools makefiles, they are not needed in