Generate bench/Android.mk from gyp.

platform_tools/android/gyp_gen/gypd_parser.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.
 
 """Functions for parsing the gypd output from gyp.
 """
 
@@ skipping 79 matching lines @@
 
   for include in d.get('include_dirs', []):
     if include.startswith('external'):
       # This path is relative to the Android root. Leave it alone.
       rel_include = include
     else:
       # As with source, the input path will be relative to gyp/, but Android
       # wants relative to dest_dir.
       rel_include = os.path.relpath(include, os.pardir)
       rel_include = os.path.relpath(rel_include, dest_dir)
+      # No need to include the base directory.
+      if rel_include is os.curdir:
+        continue
       rel_include = os.path.join('$(LOCAL_PATH)', rel_include)
 
     # Remove a trailing slash, if present.
     if rel_include.endswith('/'):
       rel_include = rel_include[:-1]
     var_dict.LOCAL_C_INCLUDES.add(rel_include)
     # For the top level, libskia, include directories should be exported.
     # FIXME (scroggo): Do not hard code this.
     if current_target_name == 'libskia':
       var_dict.LOCAL_EXPORT_C_INCLUDE_DIRS.add(rel_include)
@@ skipping 31 matching lines @@
       # Avoid circular dependencies
       continue
     if desired_targets and target_name not in desired_targets:
       # Our caller does not depend on this one
       continue
     # Add it to our known targets so we don't parse it again
     var_dict.KNOWN_TARGETS.add(target_name)
 
     parse_dictionary(var_dict, target, target_name, dest_dir)