Add mips dsp arch variants to gyp_to_android.py.

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 19 matching lines @@
 import gyp_gen.generate_user_config as generate_user_config
 import gyp_gen.makefile_writer as makefile_writer
 import gyp_gen.tool_makefile_writer as tool_makefile_writer
 import gyp_gen.vars_dict_lib as vars_dict_lib
 
 # Folder containing all gyp files and generated gypd files.
 GYP_FOLDER = 'gyp'
 
 
 def generate_var_dict(target_dir, target_file, skia_arch_type, have_neon,
-                      gyp_source_dir):
+                      have_mips_dspr2, have_mips_dspr1, gyp_source_dir):
   """Create a VarsDict for a particular arch type.
 
   Each paramater is passed directly to android_framework_gyp.main().
 
   Args:
     target_dir: Directory containing gyp files.
     target_file: Target gyp file.
     skia_arch_type: Target architecture.
     have_neon: Whether the target should build for neon.
+    have_mips_dspr2: Whether the target should build for mips_dspr2.
+    have_mips_dspr1: Whether the target should build for mips_dspr1.
     gyp_source_dir: Directory for gyp source.
   Returns:
     A VarsDict containing the variable definitions determined by gyp.
   """
   result_file = android_framework_gyp.main(target_dir, target_file,
                                            skia_arch_type, have_neon,
+                                           have_mips_dspr2, have_mips_dspr1,
                                            gyp_source_dir)
   var_dict = vars_dict_lib.VarsDict()
   gypd_parser.parse_gypd(var_dict, result_file, '.')
   android_framework_gyp.clean_gypd_files(target_dir)
   print '.',
   return var_dict
 
 def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):
   """Create Android.mk for the Android framework's external/skia.
 
@@ skipping 27 matching lines @@
     # 2. call parse_gypd to read those gypd files into the VarsDict
     # 3. delete the gypd files
     #
     # Once we have the VarsDict for each architecture type, we combine them all
     # into a single Android.mk file, which can build targets of any
     # architecture type.
 
     # The default uses a non-existant archtype, to find all the general
     # variable definitions.
     default_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'other',
-                                         False, gyp_source_dir)
+                                         False, False, False, gyp_source_dir)
     arm_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm', False,
-                                     gyp_source_dir)
+                                     False, False, gyp_source_dir)
     arm_neon_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm',
-                                          True, gyp_source_dir)
+                                          True, False, False, gyp_source_dir)
     x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False,
-                                     gyp_source_dir)
+                                     False, False, gyp_source_dir)
     x86_64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86_64',
-                                        False, gyp_source_dir)
+                                        False, False, False, gyp_source_dir)
 
     mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False,
-                                      gyp_source_dir)
+                                      False, False, gyp_source_dir)
+
+    mips_dspr2_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips',
+                                            False, True, False, gyp_source_dir)
+
+    mips_dspr1_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips',
+                                            False, False, True, gyp_source_dir)
 
     mips64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips64',
-                                        False, gyp_source_dir)
+                                        False, False, False, gyp_source_dir)
 
     arm64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm64',
-                                       False, gyp_source_dir)
+                                       False, False, False, gyp_source_dir)
 
     # Compute the intersection of all targets. All the files in the intersection
     # should be part of the makefile always. Each dict will now contain trimmed
     # lists containing only variable definitions specific to that configuration.
     var_dict_list = [default_var_dict, arm_var_dict, arm_neon_var_dict,
                      x86_var_dict, x86_64_var_dict, mips_var_dict,
-                     mips64_var_dict, arm64_var_dict]
+                     mips_dspr1_var_dict, mips_dspr2_var_dict, mips64_var_dict,
+                     arm64_var_dict]
     common = vars_dict_lib.intersect(var_dict_list)
 
     common.LOCAL_MODULE.add('libskia')
 
     # Create SkUserConfig
     user_config = os.path.join(SKIA_DIR, 'include', 'config', 'SkUserConfig.h')
     if target_dir:
       dst_dir = target_dir
     else:
       dst_dir = os.path.join(SKIA_DIR, 'include', 'core')
@@ skipping 38 matching lines @@
     deviations_from_common = []
     deviations_from_common.append(makefile_writer.VarsDictData(
         arm_var_dict, 'arm'))
     deviations_from_common.append(makefile_writer.VarsDictData(
         arm_neon_var_dict, 'arm', 'ARCH_ARM_HAVE_NEON'))
     deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict,
                                                                'x86'))
     deviations_from_common.append(makefile_writer.VarsDictData(x86_64_var_dict,
                                                                'x86_64'))
 
+    deviations_from_common.append(makefile_writer.VarsDictData(
+        mips_dspr2_var_dict, 'mips', 'mips32r2dspr2-fp'))
+
+    deviations_from_common.append(makefile_writer.VarsDictData(
+        mips_dspr1_var_dict, 'mips', 'mips32r2dsp-fp'))
+
     deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict,
                                                                'mips'))
 
     deviations_from_common.append(makefile_writer.VarsDictData(mips64_var_dict,
                                                                'mips64'))
 
     deviations_from_common.append(makefile_writer.VarsDictData(arm64_var_dict,
                                                                'arm64'))
 
     makefile_writer.write_android_mk(target_dir=target_dir,
         common=common, deviations_from_common=deviations_from_common)
 
     makefile_writer.write_static_deps_mk(target_dir=target_dir,
         common=common, deviations_from_common=deviations_from_common)
 
   finally:
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()
   parser.add_argument('--gyp_source_dir', help='Source of gyp program. '
                       'e.g. <path_to_skia>/third_party/externals/gyp')
   args = parser.parse_args()
 
   main(gyp_source_dir=args.gyp_source_dir)