Move ui and content resources into one location.

base/android/jni_generator/jni_generator.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Extracts native methods from a Java file and generates the JNI bindings.
 If you change this, please run and update the tests."""
 
 import collections
 import errno
@@ skipping 306 matching lines @@
     for old, new in JniParams._remappings:
       if old in class_name:
         return class_name.replace(old, new, 1)
     return class_name
 
   @staticmethod
   def SetJarJarMappings(mappings):
     """Parse jarjar mappings from a string."""
     JniParams._remappings = []
     for line in mappings.splitlines():
-      keyword, src, dest = line.split()
-      if keyword != 'rule':
+      rule = line.split()
+      if rule[0] != 'rule':
         continue
-      assert src.endswith('.**')
+      _, src, dest = rule
+      assert src.endswith('**')
       src = src[:-2].replace('.', '/')
       dest = dest.replace('.', '/')
+
       if dest.endswith('@0'):
         JniParams._remappings.append((src, dest[:-2] + src))
       else:
         assert dest.endswith('@1')
         JniParams._remappings.append((src, dest[:-2]))
 
 
 def ExtractJNINamespace(contents):
   re_jni_namespace = re.compile('.*?@JNINamespace\("(.*?)"\)')
   m = re.findall(re_jni_namespace, contents)
@@ skipping 1043 matching lines @@
     root_name = os.path.splitext(os.path.basename(input_file))[0]
     output_file = os.path.join(options.output_dir, root_name) + '_jni.h'
   if options.jarjar:
     with open(options.jarjar) as f:
       JniParams.SetJarJarMappings(f.read())
   GenerateJNIHeader(input_file, output_file, options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))