Allow running gyp_to_android without SkUserConfig.

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 46 matching lines @@
   @return a VarsDict containing the variable definitions determined by gyp.
   """
   result_file = android_framework_gyp.main(target_dir, target_file,
                                            skia_arch_type, have_neon)
   var_dict = vars_dict_lib.VarsDict()
   gypd_parser.parse_gypd(var_dict, result_file)
   clean_gypd_files(target_dir)
   print '.',
   return var_dict
 
-def main(target_dir=None):
+def main(target_dir=None, require_sk_user_config=False):
   """
   Read gyp files and create Android.mk for the Android framework's
   external/skia.
   @param target_dir Directory in which to place 'Android.mk'. If None, the file
                     will be placed in skia's root directory.
+  @param require_sk_user_config If True, raise an AssertionError if
+                                SkUserConfig.h does not exist.
   """
   # Create a temporary folder to hold gyp and gypd files. Create it in SKIA_DIR
   # so that it is a sibling of gyp/, so the relationships between gyp files and
   # other files (e.g. platform_tools/android/gyp/dependencies.gypi, referenced
   # by android_deps.gyp as a relative path) is unchanged.
   # Use mkdtemp to find an unused folder name, but then delete it so copytree
   # can be called with a non-existent directory.
   tmp_folder = tempfile.mkdtemp(dir=SKIA_DIR)
   os.rmdir(tmp_folder)
   shutil.copytree(os.path.join(SKIA_DIR, GYP_FOLDER), tmp_folder)
@@ skipping 35 matching lines @@
     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,
+        original_sk_user_config=user_config,
+        require_sk_user_config=require_sk_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.
@@ 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()