Pass gyp_source_dir to generate_tool.

platform_tools/android/gyp_gen/tool_makefile_writer.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.
 
 """Code for generating Android.mk for a tool."""
 
 
@@ skipping 21 matching lines @@
     makefile_writer.write_local_vars(f, var_dict, False, None)
 
     makefile_writer.write_group(f, 'LOCAL_PICKUP_FILES',
                                 ['$(LOCAL_PATH)/../resources'], False)
 
     f.write('include $(BUILD_NATIVE_TEST)\n')
 
 
 def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir,
                   skia_lib_var_dict, local_module_name, local_module_tags,
-                  desired_targets):
+                  desired_targets, gyp_source_dir=None):
   """Common steps for building one of the skia tools.
 
   Parse a gyp file and create an Android.mk for this tool.
 
   Args:
     gyp_dir: Directory containing gyp files.
     target_file: gyp file for the project to be built, contained in gyp_dir.
     skia_trunk: Trunk of Skia, used for determining the destination to write
       'Android.mk'.
     dest_dir: Destination for 'Android.mk', relative to skia_trunk. Used for
       both writing relative paths in the makefile and for determining the
       destination to write the it.
     skia_lib_var_dict: VarsDict representing libskia. Used as a reference to
       ensure we do not duplicate anything in this Android.mk.
     local_module_name: Name for this tool, to set as LOCAL_MODULE.
     local_module_tags: Tags to pass to LOCAL_MODULE_TAG.
     desired_targets: List of targets to parse.
+    gyp_source_dir: Source directory for gyp.
   """
   result_file = android_framework_gyp.main(target_dir=gyp_dir,
                                            target_file=target_file,
                                            skia_arch_type='other',
-                                           have_neon=False)
+                                           have_neon=False,
+                                           gyp_source_dir=gyp_source_dir)
 
   var_dict = vars_dict_lib.VarsDict()
 
   # Add known targets from skia_lib, so we do not reparse them.
   var_dict.KNOWN_TARGETS.set(skia_lib_var_dict.KNOWN_TARGETS)
 
   gypd_parser.parse_gypd(var_dict, result_file, dest_dir, desired_targets)
 
   android_framework_gyp.clean_gypd_files(gyp_dir)
 
@@ skipping 13 matching lines @@
     full_dest = os.path.join(skia_trunk, dest_dir)
   else:
     full_dest = dest_dir
 
   # If the path does not exist, create it. This will happen during testing,
   # where there is no subdirectory for each tool (just a temporary folder).
   if not os.path.exists(full_dest):
     os.mkdir(full_dest)
 
   write_tool_android_mk(target_dir=full_dest, var_dict=var_dict)