Android backend: tidy up the --suffix handling.

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 986 matching lines @@
   toolsets = set([target_dicts[target]['toolset'] for target in target_list])
   for target in target_list:
     spec = target_dicts[target]
     if spec['default_configuration'] != 'Default':
       default_configuration = spec['default_configuration']
       break
   if not default_configuration:
     default_configuration = 'Default'
 
   srcdir = '.'
-  makefile_name = 'GypAndroid.mk' + options.suffix
+  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)
   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,
@@ skipping 65 matching lines @@
   for include_file in sorted(include_list):
     root_makefile.write('include $(LOCAL_PATH)/' + include_file + '\n')
   root_makefile.write('\n')
 
   if generator_flags.get('auto_regeneration', True):
     WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
 
   root_makefile.write(SHARED_FOOTER)
 
   root_makefile.close()