Android backend: allow targets to have unmangled names.

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 27 matching lines @@
   'RULE_INPUT_PATH': '$(RULE_SOURCES)',
   'RULE_INPUT_EXT': '$(suffix $<)',
   'RULE_INPUT_NAME': '$(notdir $<)',
   'CONFIGURATION_NAME': 'NOT_USED_ON_ANDROID',
 }
 
 # Make supports multiple toolsets
 generator_supports_multiple_toolsets = True
 
 
+# Generator-specific gyp specs.
+generator_additional_non_configuration_keys = [
+    # Boolean to declare that this target does not want its name mangled.
+    'android_unmangled_name',
+]
+generator_additional_path_sections = []
+generator_extra_sources_for_rules = []
+
+
 SHARED_FOOTER = """\
 # "gyp_all_modules" is a concatenation of the "gyp_all_modules" targets from
 # all the included sub-makefiles. This is just here to clarify.
 gyp_all_modules:
 """
 
 header = """\
 # This file is generated by gyp; do not edit.
 
 """
@@ skipping 512 matching lines @@
 
 
   def ComputeAndroidModule(self, spec):
     """Return the Android module name used for a gyp spec.
 
     We use the complete qualified target name to avoid collisions between
     duplicate targets in different directories. We also add a suffix to
     distinguish gyp-generated module names.
     """
 
+    if spec.get('android_unmangled_name'):

[Nico, 2012/10/15 23:35:13]

This is true for targets that say

  'android_unmangled_name': '0'

too, which is a bit unintuitive

[Torne, 2012/10/16 10:34:31]

Done.

+      assert self.type != 'shared_library' or self.target.startswith('lib')
+      return self.target
+
     if self.type == 'shared_library':
       # For reasons of convention, the Android build system requires that all
       # shared library modules are named 'libfoo' when generating -l flags.
       prefix = 'lib_'
     else:
       prefix = ''
 
     if spec['toolset'] == 'host':
       suffix = '_host_gyp'
     else:
@@ skipping 242 matching lines @@
     # the Make target 'all' on Android.
     if part_of_all:
       self.WriteLn('# Add target alias to "gyp_all_modules" target.')
       self.WriteLn('.PHONY: gyp_all_modules')
       self.WriteLn('gyp_all_modules: %s' % self.android_module)
       self.WriteLn('')
 
     # Add an alias from the gyp target name to the Android module name. This
     # simplifies manual builds of the target, and is required by the test
     # framework.
-    self.WriteLn('# Alias gyp target name.')
-    self.WriteLn('.PHONY: %s' % self.target)
-    self.WriteLn('%s: %s' % (self.target, self.android_module))
-    self.WriteLn('')
+    if self.target != self.android_module:
+      self.WriteLn('# Alias gyp target name.')
+      self.WriteLn('.PHONY: %s' % self.target)
+      self.WriteLn('%s: %s' % (self.target, self.android_module))
+      self.WriteLn('')
 
     # Add the command to trigger build of the target type depending
     # on the toolset. Ex: BUILD_STATIC_LIBRARY vs. BUILD_HOST_STATIC_LIBRARY
     # NOTE: This has to come last!
     modifier = ''
     if self.toolset == 'host':
       modifier = 'HOST_'
     if self.type == 'static_library':
       self.WriteLn('include $(BUILD_%sSTATIC_LIBRARY)' % modifier)
     elif self.type == 'shared_library':
@@ skipping 213 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()