Android: Add owned resources 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 logging
@@ skipping 16 matching lines @@
 from util import build_utils
 
 
 _DEFAULT_ANDROID_MANIFEST_PATH = os.path.join(
     host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'AndroidManifest.xml')
 _FILE_DIR = os.path.dirname(__file__)
 _JAVA_SUBDIR = 'symlinked-java'
 _SRCJARS_SUBDIR = 'extracted-srcjars'
 _JNI_LIBS_SUBDIR = 'symlinked-libs'
 _ARMEABI_SUBDIR = 'armeabi'
+_RES_SUBDIR = 'extracted-res'
 
 _DEFAULT_TARGETS = [
     # TODO(agrieve): Requires alternate android.jar to compile.
     # '//android_webview:system_webview_apk',
     '//android_webview/test:android_webview_apk',
     '//android_webview/test:android_webview_test_apk',
     '//base:base_junit_tests',
     '//chrome/android:chrome_junit_tests',
     '//chrome/android:chrome_public_apk',
     '//chrome/android:chrome_public_test_apk',
@@ skipping 158 matching lines @@
 
   def _GenJavaDirs(self, entry):
     java_dirs = _CreateJavaSourceDir(
         constants.GetOutDirectory(), self.EntryOutputDir(entry),
         entry.JavaFiles())
     if self.Srcjars(entry):
       java_dirs.append(
           os.path.join(self.EntryOutputDir(entry), _SRCJARS_SUBDIR))
     return java_dirs
 
+  def _GenResDirs(self, entry):
+    res_dirs = entry.DepsInfo().get('owned_resources_dirs', [])

[agrieve, 2017/02/01 19:24:12]

nit: you're mutating the list that lives in the config. It's not hurting
anything, but generally should be avoided. Just duplicated it with list(...)

[Peter Wen, 2017/02/01 22:09:55]

Done.

+    zips = entry.DepsInfo().get('owned_resources_zips', [])

[agrieve, 2017/02/01 19:24:12]

nit: don't need the default value of [] since you guard on it on the next line

[Peter Wen, 2017/02/01 22:09:54]

Done.

+    if zips:
+      res_dir = os.path.join(self.EntryOutputDir(entry), _RES_SUBDIR)

[agrieve, 2017/02/01 19:24:12]

nit: add a comment that these are just for generated resources (e.g. grit(),
jinja_template_resources())

[Peter Wen, 2017/02/01 22:09:55]

Done.

+      for zip_path in _RebasePath(zips):
+        logging.info('Extracting %s to %s', zip_path, res_dir)

[agrieve, 2017/02/01 19:24:12]

maybe: Make a helper function for this and share it with _ExtractSrcjars()

[Peter Wen, 2017/02/01 22:09:55]

Done.

+        with zipfile.ZipFile(zip_path) as z:
+          z.extractall(res_dir)
+      res_dirs.append(res_dir)
+    return res_dirs
+
   def _Relativize(self, entry, paths):
     return _RebasePath(paths, self.EntryOutputDir(entry))
 
   def EntryOutputDir(self, entry):
     return os.path.join(self.project_dir, entry.GradleSubdir())
 
   def Srcjars(self, entry):
     srcjars = _RebasePath(entry.Gradle().get('bundled_srcjars', []))
     if not self.use_gradle_process_resources:
       srcjars += _RebasePath(entry.BuildConfig()['javac']['srcjars'])
     return srcjars
 
   def GeneratedInputs(self, entry):
     generated_inputs = []
     generated_inputs.extend(self.Srcjars(entry))
     generated_inputs.extend(
         p for p in entry.JavaFiles() if not p.startswith('..'))
     generated_inputs.extend(entry.Gradle()['dependent_prebuilt_jars'])
     return generated_inputs
 
   def Generate(self, entry):
     variables = {}
     android_test_manifest = entry.Gradle().get(
         'android_manifest', _DEFAULT_ANDROID_MANIFEST_PATH)
     variables['android_manifest'] = self._Relativize(
         entry, android_test_manifest)
     variables['java_dirs'] = self._Relativize(entry, self._GenJavaDirs(entry))
     variables['jni_libs'] = self._Relativize(entry, self._GenJniLibs(entry))
+    variables['res_dirs'] = self._Relativize(entry, self._GenResDirs(entry))
     deps = [_ProjectEntry.FromBuildConfigPath(p)
             for p in entry.Gradle()['dependent_android_projects']]
     variables['android_project_deps'] = [d.ProjectName() for d in deps]
     # TODO(agrieve): Add an option to use interface jars and see if that speeds
     # things up at all.
     variables['prebuilts'] = self._Relativize(
         entry, entry.Gradle()['dependent_prebuilt_jars'])
     deps = [_ProjectEntry.FromBuildConfigPath(p)
             for p in entry.Gradle()['dependent_java_projects']]
     variables['java_project_deps'] = [d.ProjectName() for d in deps]
@@ skipping 337 matching lines @@
     _ExtractSrcjars(generator.project_dir, srcjar_tuples)
 
   logging.warning('Project created! (%d subprojects)', len(project_entries))
   logging.warning('Generated projects work best with Android Studio 2.2')
   logging.warning('For more tips: https://chromium.googlesource.com/chromium'
                   '/src.git/+/master/docs/android_studio.md')
 
 
 if __name__ == '__main__':
   main()