Updates to Android.mk generation.

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 generate_user_config
 import makefile_writer
 import vars_dict_lib
 
 # Folder containing all gyp files and generated gypd files.
 GYP_FOLDER = 'gyp'
 
 # TODO(scroggo): Update the docstrings to match the style guide:
 # http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Comments
 def clean_gypd_files(folder):
   """
@@ skipping 60 matching lines @@
     # 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)
     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)
 
+    arm64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'arm64',
+                                       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,
-                     x86_var_dict, mips_var_dict]
+                     x86_var_dict, mips_var_dict, arm64_var_dict]
     common = vars_dict_lib.intersect(var_dict_list)
 
+    # 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')
+
+    generate_user_config.generate_user_config(
+        original_sk_user_config=user_config, target_dir=dst_dir,
+        ordered_set=common.DEFINES)
+
+    # Now that the defines have been written to SkUserConfig, they are not
+    # needed in Android.mk.
+    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.
     arm_var_dict = vars_dict_lib.intersect([arm_var_dict, arm_neon_var_dict])
 
     # Now create a list of VarsDictData holding everything but common.
     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'))
     # Currently, x86_64 is identical to x86
     deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict,
                                                                'x86_64'))
 
     deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict,
                                                                'mips'))
 
+    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)
 
   finally:
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
   main()