Android: replace NONE module class with GYP.

pylib/gyp/generator/android.py

Index: pylib/gyp/generator/android.py
===================================================================
--- pylib/gyp/generator/android.py	(revision 1521)
+++ pylib/gyp/generator/android.py	(working copy)
@@ -163,7 +163,7 @@
     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)