Updates to the Android.mk writer.

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.
 """
 
 import android_framework_gyp
 import os
 import shutil
 import sys
 import tempfile
 
 # Find the top of trunk
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
 SKIA_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir,
                                          os.pardir))
 
 # Find the directory with our helper files, and add it to the path.
 GYP_GEN_DIR = os.path.join(SKIA_DIR, 'platform_tools', 'android', 'gyp_gen')
 sys.path.append(GYP_GEN_DIR)
 
 import gypd_parser
 import makefile_writer
-import variables
 import vars_dict_lib
 
 # Folder containing all gyp files and generated gypd files.
 GYP_FOLDER = 'gyp'
 
 def clean_gypd_files(folder):
   """
   Remove the gypd files generated by android_framework_gyp.main().
   @param folder Folder in which to delete all files ending with 'gypd'.
   """
@@ skipping 53 matching lines @@
     # 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)
     arm_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm', False)
     arm_neon_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm',
                                           True)
-    if variables.INCLUDE_X86_OPTS:
-      x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False)
-    else:
-      x86_var_dict = None
+    x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False)
+
+    mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False)
 
     # 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]
-    if variables.INCLUDE_X86_OPTS:
-      var_dict_list.append(x86_var_dict)
+    var_dict_list = [default_var_dict, arm_var_dict, arm_neon_var_dict,
+                     x86_var_dict, mips_var_dict]
     common = vars_dict_lib.intersect(var_dict_list)
 
     # 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.
     arm_var_dict = vars_dict_lib.intersect([arm_var_dict, arm_neon_var_dict])
 
+    # Now create a list of VarsDictData holding everything but common.
+    li = list()

[epoger, 2014/02/28 15:56:43]

Please use a more descriptive variable name.  Maybe deviations_from_common ?

Much less importantly, I think it's more common to initialize the empty list
like so:
li = []

[scroggo, 2014/02/28 16:16:57]

Done.

+    li.append(makefile_writer.VarsDictData(arm_var_dict, 'arm'))
+    li.append(makefile_writer.VarsDictData(arm_neon_var_dict, 'arm',
+                                           'ARCH_ARM_HAVE_NEON'))
+    li.append(makefile_writer.VarsDictData(x86_var_dict, 'x86'))
+    # Currently, x86_64 is identical to x86
+    li.append(makefile_writer.VarsDictData(x86_var_dict, 'x86_64'))
+
+    li.append(makefile_writer.VarsDictData(mips_var_dict, 'mips'))
+
     makefile_writer.write_android_mk(target_dir=target_dir,
                                      common=common,
-                                     arm=arm_var_dict,
-                                     arm_neon=arm_neon_var_dict,
-                                     x86=x86_var_dict,
-                                     default=default_var_dict)
+                                     the_rest=li)
 
   finally:
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
   main()