Use tests tag for Skia tools on Android.

platform_tools/android/bin/gyp_to_android.py

 #!/usr/bin/python
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Script for generating the Android framework's version of Skia from gyp
 files.
@@ skipping 115 matching lines @@
         original_sk_user_config=user_config,
         require_sk_user_config=require_sk_user_config, target_dir=dst_dir,
         ordered_set=common.DEFINES)
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='tests.gyp',
                                        skia_trunk=target_dir,
                                        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',
                                        skia_trunk=target_dir,
                                        dest_dir='bench',
                                        skia_lib_var_dict=common,
                                        local_module_name='skia_bench',
                                        local_module_tags=['tests'],
                                        place_in_local_tmp=True)
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='gm.gyp',
                                        skia_trunk=target_dir,
                                        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',
                                        skia_trunk=target_dir,
                                        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
     # Android.mk. Reset DEFINES.
     common.DEFINES.reset()
 
     # Further trim arm_neon_var_dict with arm_var_dict. After this call,
     # arm_var_dict (which will now be the intersection) includes all definitions
     # used by both arm and arm + neon, and arm_neon_var_dict will only contain
     # those specific to arm + neon.
@@ skipping 18 matching lines @@
                                                                'arm64'))
 
     makefile_writer.write_android_mk(target_dir=target_dir,
         common=common, deviations_from_common=deviations_from_common)
 
   finally:
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
   main()