Explicitly include gyp_gen/android_framework_gyp.

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 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)
+ANDROID_TOOLS = os.path.join(SKIA_DIR, 'platform_tools', 'android')
+sys.path.append(ANDROID_TOOLS)
 
-import android_framework_gyp
-import gypd_parser
-import generate_user_config
-import makefile_writer
-import tool_makefile_writer
-import vars_dict_lib
+import gyp_gen.android_framework_gyp as android_framework_gyp
+import gyp_gen.gypd_parser as gypd_parser
+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):
   """Create a VarsDict for a particular arch type.
 
   Each paramater is passed directly to android_framework_gyp.main().
 
@@ skipping 131 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()