Android: Split up build.gradle.jinja

Android: Split up build.gradle.jinja

Increase ninja concurrency from 50 to 1000. Load templates from script
directory. No visible changes except some whitespace differences.

BUG=680217
Review-Url: https://codereview.chromium.org/2621413002
Cr-Commit-Position: refs/heads/master@{#443278}
Committed: https://chromium.googlesource.com/chromium/src/+/698728ae3b1ceb1cef98276d6e7fc06a1a63336f

[Peter Wen, 2017-01-11 19:31:40]

wnwen@chromium.org changed reviewers:
+ agrieve@chromium.org

[Peter Wen, 2017-01-11 19:31:40]

💡

[agrieve, 2017-01-11 19:51:45]

lgtm

https://codereview.chromium.org/2621413002/diff/1/build/android/gradle/genera...
File build/android/gradle/generate_gradle.py (right):

https://codereview.chromium.org/2621413002/diff/1/build/android/gradle/genera...
build/android/gradle/generate_gradle.py:53: 
nit: 2 blank lines between to-level functions

https://codereview.chromium.org/2621413002/diff/1/build/android/gyp/jinja_tem...
File build/android/gyp/jinja_template.py (right):

https://codereview.chromium.org/2621413002/diff/1/build/android/gyp/jinja_tem...
build/android/gyp/jinja_template.py:40: self.variables = variables or {}
curious why this was needed?

[Peter Wen, 2017-01-11 20:00:27]

Thanks for the quick review!

https://codereview.chromium.org/2621413002/diff/1/build/android/gradle/genera...
File build/android/gradle/generate_gradle.py (right):

https://codereview.chromium.org/2621413002/diff/1/build/android/gradle/genera...
build/android/gradle/generate_gradle.py:53: 
On 2017/01/11 19:51:44, agrieve wrote:
> nit: 2 blank lines between to-level functions

Done.

https://codereview.chromium.org/2621413002/diff/1/build/android/gyp/jinja_tem...
File build/android/gyp/jinja_template.py (right):

https://codereview.chromium.org/2621413002/diff/1/build/android/gyp/jinja_tem...
build/android/gyp/jinja_template.py:40: self.variables = variables or {}
On 2017/01/11 19:51:44, agrieve wrote:
> curious why this was needed?

Since both self.variables and variables were None in Render it caused a "not
iterable" exception in template.render(). This ensures that at least
self.variables is valid and iterable.

[Peter Wen, 2017-01-11 20:01:18]

The CQ bit was checked by wnwen@chromium.org

[Peter Wen, 2017-01-11 20:01:19]

The patchset sent to the CQ was uploaded after l-g-t-m from agrieve@chromium.org
Link to the patchset: https://codereview.chromium.org/2621413002/#ps20001
(title: "Fix whitespace")

[commit-bot: I haz the power, 2017-01-11 20:01:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-11 20:25:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-11 20:25:37]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Peter Wen, 2017-01-12 14:16:57]

The CQ bit was checked by wnwen@chromium.org

[commit-bot: I haz the power, 2017-01-12 14:17:09]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-12 14:57:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-12 14:57:53]

Failed to apply patch for build/android/gradle/generate_gradle.py:
While running git apply --index -p1;
  error: patch failed: build/android/gradle/generate_gradle.py:29
  error: build/android/gradle/generate_gradle.py: patch does not apply

Patch:       build/android/gradle/generate_gradle.py
Index: build/android/gradle/generate_gradle.py
diff --git a/build/android/gradle/generate_gradle.py
b/build/android/gradle/generate_gradle.py
index
6a6e850d7e833ef2093d95ae22711f9e3cfeefbb..01966396cce3cc5374f443781a982c621f9a3482
100755
--- a/build/android/gradle/generate_gradle.py
+++ b/build/android/gradle/generate_gradle.py
@@ -29,9 +29,7 @@ from util import build_utils
 
 _DEFAULT_ANDROID_MANIFEST_PATH = os.path.join(
     host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'AndroidManifest.xml')
-_JINJA_TEMPLATE_PATH = os.path.join(
-    os.path.dirname(__file__), 'build.gradle.jinja')
-
+_FILE_DIR = os.path.dirname(__file__)
 _JAVA_SUBDIR = 'symlinked-java'
 _SRCJARS_SUBDIR = 'extracted-srcjars'
 
@@ -50,6 +48,11 @@ _DEFAULT_TARGETS = [
     '//content/shell/android:content_shell_apk',
 ]
 
+
+def _TemplatePath(name):
+  return os.path.join(_FILE_DIR, '{}.jinja'.format(name))
+
+
 def _RebasePath(path_or_list, new_cwd=None, old_cwd=None):
   """Makes the given path(s) relative to new_cwd, or absolute if not specified.
 
@@ -88,7 +91,7 @@ def _ReadBuildVars(output_dir):
 
 
 def _RunNinja(output_dir, args):
-  cmd = ['ninja', '-C', output_dir, '-j50']
+  cmd = ['ninja', '-C', output_dir, '-j1000']
   cmd.extend(args)
   logging.info('Running: %r', cmd)
   subprocess.check_call(cmd)
@@ -299,13 +302,13 @@ def _GenerateGradleFile(build_config, build_vars,
java_dirs, relativize,
           for p in gradle['dependent_java_projects']]
   variables['java_project_deps'] = [d.ProjectName() for d in deps]
 
-  return jinja_processor.Render(_JINJA_TEMPLATE_PATH, variables)
+  return jinja_processor.Render(
+      _TemplatePath(target_type.split('_')[0]), variables)
 
 
 def _GenerateRootGradle(jinja_processor):
   """Returns the data for the root project's build.gradle."""
-  variables = {'template_type': 'root'}
-  return jinja_processor.Render(_JINJA_TEMPLATE_PATH, variables)
+  return jinja_processor.Render(_TemplatePath('root'))
 
 
 def _GenerateSettingsGradle(project_entries):
@@ -417,7 +420,7 @@ def main():
   logging.info('Found %d dependent build_config targets.', len(all_entries))
 
   logging.warning('Writing .gradle files...')
-  jinja_processor = jinja_template.JinjaProcessor(host_paths.DIR_SOURCE_ROOT)
+  jinja_processor = jinja_template.JinjaProcessor(_FILE_DIR)
   build_vars = _ReadBuildVars(output_dir)
   project_entries = []
   srcjar_tuples = []

[Peter Wen, 2017-01-12 15:19:14]

The CQ bit was checked by wnwen@chromium.org

[Peter Wen, 2017-01-12 15:19:15]

The patchset sent to the CQ was uploaded after l-g-t-m from agrieve@chromium.org
Link to the patchset: https://codereview.chromium.org/2621413002/#ps40001
(title: "Rebase")

[commit-bot: I haz the power, 2017-01-12 15:19:46]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-12 16:37:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-12 16:37:04]

Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[Peter Wen, 2017-01-12 17:28:56]

The CQ bit was checked by wnwen@chromium.org

[commit-bot: I haz the power, 2017-01-12 17:29:27]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-12 17:37:27]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1484242136801360,
"parent_rev": "b91494e0b93d93fd6583be0794cf5f25bf333322", "commit_rev":
"698728ae3b1ceb1cef98276d6e7fc06a1a63336f"}

[commit-bot: I haz the power, 2017-01-12 17:38:17]

Description was changed from

==========
Android: Split up build.gradle.jinja

Increase ninja concurrency from 50 to 1000. Load templates from script
directory. No visible changes except some whitespace differences.

BUG=680217
==========

to

==========
Android: Split up build.gradle.jinja

Increase ninja concurrency from 50 to 1000. Load templates from script
directory. No visible changes except some whitespace differences.

BUG=680217

Review-Url: https://codereview.chromium.org/2621413002
Cr-Commit-Position: refs/heads/master@{#443278}
Committed:
https://chromium.googlesource.com/chromium/src/+/698728ae3b1ceb1cef98276d6e7f...
==========

[commit-bot: I haz the power, 2017-01-12 17:38:18]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/chromium/src/+/698728ae3b1ceb1cef98276d6e7f...