Android: Add resources back to Android Studio

build/android/gradle/generate_gradle.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Generates an Android Studio project from a GN target."""
 
 import argparse
 import codecs
 import glob
@@ skipping 235 matching lines @@
   """Helper class to generate gradle build files"""
   def __init__(self, project_dir, build_vars, use_gradle_process_resources,
       jinja_processor, split_projects):
     self.project_dir = project_dir
     self.build_vars = build_vars
     self.use_gradle_process_resources = use_gradle_process_resources
     self.jinja_processor = jinja_processor
     self.split_projects = split_projects
     self.processed_java_dirs = set()
     self.processed_prebuilts = set()
+    self.processed_res_dirs = set()
 
   def _GenJniLibs(self, root_entry):
     libraries = []
     for entry in self._GetEntries(root_entry):
       libraries += entry.BuildConfig().get('native', {}).get('libraries', [])
     if libraries:
       return _CreateJniLibsDir(constants.GetOutDirectory(),
           self.EntryOutputDir(root_entry), libraries)
     return []
 
@@ skipping 83 matching lines @@
     variables['java_dirs'] = self._Relativize(root_entry, java_dirs)
     variables['java_excludes'] = excludes
     variables['jni_libs'] = self._Relativize(
         root_entry, set(self._GenJniLibs(root_entry)))
     prebuilts = set(
         p for e in self._GetEntries(root_entry) for p in e.PrebuiltJars())
     self.processed_prebuilts.update(prebuilts)
     variables['prebuilts'] = self._Relativize(root_entry, prebuilts)
     res_dirs = set(
         p for e in self._GetEntries(root_entry) for p in e.ResDirs())
+    # Do not add generated resources for the all module since it creates many
+    # duplicates, and currently resources are only used for editing.
+    self.processed_res_dirs.update(res_dirs)
     res_dirs.add(
         os.path.join(self.EntryOutputDir(root_entry), _RES_SUBDIR))
     variables['res_dirs'] = self._Relativize(root_entry, res_dirs)
     android_manifest = root_entry.Gradle().get('android_manifest')
     if not android_manifest:
       android_manifest = self._GenCustomManifest(root_entry)
     variables['android_manifest'] = self._Relativize(
         root_entry, android_manifest)
     if self.split_projects:
       deps = [_ProjectEntry.FromBuildConfigPath(p)
@@ skipping 190 matching lines @@
     source_properties, jinja_processor):
   """Returns the data for a pseudo build.gradle of all dirs.
 
   See //docs/android_studio.md for more details."""
   variables = _GenerateBaseVars(generator, build_vars, source_properties)
   target_type = 'android_apk'
   variables['target_name'] = _MODULE_ALL
   variables['template_type'] = target_type
   java_dirs = sorted(generator.processed_java_dirs)
   prebuilts = sorted(generator.processed_prebuilts)
+  res_dirs = sorted(generator.processed_res_dirs)
   def Relativize(paths):
     return _RebasePath(paths, os.path.join(gradle_output_dir, _MODULE_ALL))
   main_java_dirs = [d for d in java_dirs if not _IsTestDir(d)]
   test_java_dirs = [d for d in java_dirs if _IsTestDir(d)]
   variables['main'] = {
       'android_manifest': Relativize(_DEFAULT_ANDROID_MANIFEST_PATH),
       'java_dirs': Relativize(main_java_dirs),
       'prebuilts': Relativize(prebuilts),
       'java_excludes': ['**/*.java'],
+      'res_dirs': Relativize(res_dirs),
   }
   variables['android_test'] = {
       'java_dirs': Relativize(test_java_dirs),
       'java_excludes': ['**/*.java'],
   }
   data = jinja_processor.Render(
       _TemplatePath(target_type.split('_')[0]), variables)
   _WriteFile(
       os.path.join(gradle_output_dir, _MODULE_ALL, _GRADLE_BUILD_FILE), data)
 
@@ skipping 224 matching lines @@
     _ExtractZips(generator.project_dir, zip_tuples)
 
   logging.warning('Project created!')
   logging.warning('Generated projects work with Android Studio 2.3')
   logging.warning('For more tips: https://chromium.googlesource.com/chromium'
                   '/src.git/+/master/docs/android_studio.md')
 
 
 if __name__ == '__main__':
   main()