Android: replace NONE module class with GYP.

test/lib/TestGyp.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.
 
 """
 TestGyp.py:  a testing framework for GYP integration tests.
 """
 
 import os
 import re
@@ skipping 382 matching lines @@
     # We need to remove all gyp outputs from out/. Ths is because some tests
     # don't have rules to regenerate output, so they will simply re-use stale
     # output if present. Since the test working directory gets regenerated for
     # each test run, this can confuse things.
     # We don't have a list of build outputs because we don't know which
     # dependent targets were built. Instead we delete all gyp-generated output.
     # This may be excessive, but should be safe.
     out_dir = os.environ['ANDROID_PRODUCT_OUT']
     obj_dir = os.path.join(out_dir, 'obj')
     shutil.rmtree(os.path.join(obj_dir, 'GYP'), ignore_errors = True)
-    shutil.rmtree(os.path.join(obj_dir, 'NONE'), ignore_errors = True)
     for x in ['EXECUTABLES', 'STATIC_LIBRARIES', 'SHARED_LIBRARIES']:
       for d in os.listdir(os.path.join(obj_dir, x)):
         if d.endswith('_gyp_intermediates'):
           shutil.rmtree(os.path.join(obj_dir, x, d), ignore_errors = True)
     for x in [os.path.join('obj', 'lib'), os.path.join('system', 'lib')]:
       for d in os.listdir(os.path.join(out_dir, x)):
         if d.endswith('_gyp.so'):
           os.remove(os.path.join(out_dir, x, d))
 
     super(TestGypAndroid, self).__init__(*args, **kw)
@@ skipping 626 matching lines @@
 
 def TestGyp(*args, **kw):
   """
   Returns an appropriate TestGyp* instance for a specified GYP format.
   """
   format = kw.pop('format', os.environ.get('TESTGYP_FORMAT'))
   for format_class in format_class_list:
     if format == format_class.format:
       return format_class(*args, **kw)
   raise Exception, "unknown format %r" % format