Android: replace NONE module class with GYP.

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 145 matching lines @@
     self.toolset = spec['toolset']
 
     deps, link_deps = self.ComputeDeps(spec)
 
     # Some of the generation below can add extra output, sources, or
     # link dependencies.  All of the out params of the functions that
     # follow use names like extra_foo.
     extra_outputs = []
     extra_sources = []
 
-    self.android_class = MODULE_CLASSES.get(self.type, 'NONE')
+    self.android_class = MODULE_CLASSES.get(self.type, 'GYP')

[Nico, 2012/10/22 17:15:22]

'GYP' is fairly general. Maybe 'GYP_NONE'?

[Torne, 2012/10/23 09:54:03]

That would go back to having two directories, though: GYP already exists because
GYP/shared_intermediates is where SHARED_INTERMEDIATE_DIR points, and changing
that to GYP_NONE doesn't make any sense.

The android module names have to be globally unique anyway regardless of class,
so they can't clash. The class just has to be a string that the Android build
system doesn't recognise, in order to catch any bugs where the module's rules
are not fully specified by the gyp-generated makefiles (we don't want to allow
the default behaviours to be invoked).

     self.android_module = self.ComputeAndroidModule(spec)
     (self.android_stem, self.android_suffix) = self.ComputeOutputParts(spec)
     self.output = self.output_binary = self.ComputeOutput(spec)
 
     # Standard header.
     self.WriteLn('include $(CLEAR_VARS)\n')
 
     # Module class and name.
     self.WriteLn('LOCAL_MODULE_CLASS := ' + self.android_class)
     self.WriteLn('LOCAL_MODULE := ' + self.android_module)
@@ skipping 906 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()