Use gyp.common.EnsureDirExists() in more places.

pylib/gyp/generator/android.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Notes:
 #
 # This generates makefiles suitable for inclusion into the Android build system
 # via an Android.mk file. It is based on make.py, the standard makefile
 # generator.
 #
@@ skipping 127 matching lines @@
 
     Arguments:
       qualified_target: target we're generating
       relative_target: qualified target name relative to the root
       base_path: path relative to source root we're building in, used to resolve
                  target-relative paths
       output_filename: output .mk file name to write
       spec, configs: gyp info
       part_of_all: flag indicating this target is part of 'all'
     """
-    make.ensure_directory_exists(output_filename)
+    gyp.common.EnsureDirExists(output_filename)
 
     self.fp = open(output_filename, 'w')
 
     self.fp.write(header)
 
     self.qualified_target = qualified_target
     self.relative_target = relative_target
     self.path = base_path
     self.target = spec['target_name']
     self.type = spec['type']
@@ skipping 817 matching lines @@
       default_configuration = spec['default_configuration']
       break
   if not default_configuration:
     default_configuration = 'Default'
 
   srcdir = '.'
   makefile_name = 'GypAndroid' + options.suffix + '.mk'
   makefile_path = os.path.join(options.toplevel_dir, makefile_name)
   assert not options.generator_output, (
       'The Android backend does not support options.generator_output.')
-  make.ensure_directory_exists(makefile_path)
+  gyp.common.EnsureDirExists(makefile_path)
   root_makefile = open(makefile_path, 'w')
 
   root_makefile.write(header)
 
   # We set LOCAL_PATH just once, here, to the top of the project tree. This
   # allows all the other paths we use to be relative to the Android.mk file,
   # as the Android build system expects.
   root_makefile.write('\nLOCAL_PATH := $(call my-dir)\n')
 
   # Find the list of targets that derive from the gyp file(s) being built.
@@ skipping 63 matching lines @@
 
   # Write out the sorted list of includes.
   root_makefile.write('\n')
   for include_file in sorted(include_list):
     root_makefile.write('include $(LOCAL_PATH)/' + include_file + '\n')
   root_makefile.write('\n')
 
   root_makefile.write(SHARED_FOOTER)
 
   root_makefile.close()