Add self tests for gyp_to_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 verision of Skia from gyp
     files.
@@ skipping 334 matching lines @@
   Remove the gypd files generated by android_framework_gyp.main().
   """
   assert os.path.isdir(GYP_FOLDER)
   files = os.listdir(GYP_FOLDER)
   for f in files:
     if f.endswith('gypd'):
       os.remove(os.path.join(GYP_FOLDER, f))
 
 import android_framework_gyp
 
 def main():

[epoger, 2014/01/21 20:00:51]

Please add docstring describing meaning of return value.

[scroggo, 2014/01/22 16:36:48]

Return value removed, but doc string added.

   # Move up to top of trunk
   script_dir = os.path.dirname(__file__)
   skia_dir = os.path.normpath(os.path.join(script_dir, os.pardir, os.pardir,
                                            os.pardir))
   os.chdir(skia_dir)
 
   main_gypd_file = os.path.join(GYP_FOLDER, 'android_framework_lib.gypd')
 
   print 'Creating Android.mk',
 
@@ skipping 40 matching lines @@
   common = 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 = Intersect([arm_var_dict, arm_neon_var_dict])
 
   WriteAndroidMk(common, arm_var_dict, arm_neon_var_dict, x86_var_dict,
                  default_var_dict)
+  return 0

[epoger, 2014/01/21 20:00:51]

How would main() ever return anything but 0?

[scroggo, 2014/01/22 16:36:48]

It would not. Removed.

[scroggo, 2014/01/22 19:32:50]

D'oh! I thought I removed it. Removed in next patch.

 
 if __name__ == '__main__':
   main()