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}

build/android/gradle/build.gradle.jinja → build/android/gradle/android.jinja

@@ -2,46 +2,6 @@
 {# Use of this source code is governed by a BSD-style license that can be #}
 {# found in the LICENSE file. #}
 // Generated by //build/android/generate_gradle.py
-{% if template_type == 'root' %}
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:2.2.3"
-    }
-}
-
-{% elif template_type in ('java_library', 'java_binary') %}
-
-apply plugin: "java"
-{% if template_type == 'java_binary' %}
-apply plugin: "application"
-{% endif %}
-
-sourceSets {
-    main {
-        java.srcDirs = [
-{% for path in java_dirs %}
-            "{{ path }}",
-{% endfor %}
-        ]
-    }
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
-
-{% if template_type == 'java_binary' %}
-mainClassName = "{{ main_class }}"
-applicationName = "{{ target_name }}"
-{% endif %}
-{% if template_type in ('java_binary', 'java_library') %}
-archivesBaseName = "{{ target_name }}"
-{% endif %}
-
-{% else %}
 
 {% if template_type in ('android_library', 'android_junit') %}
 apply plugin: "com.android.library"
@@ -89,22 +49,8 @@ android {
     }
 }
 
-{% endif %}
-{% if template_type != 'root' %}
+{% include 'dependencies.jinja' %}
 
-dependencies {
-{% for path in prebuilts %}
-    {{ depCompileName }} files("{{ path }}")
-{% endfor %}
-{% for proj in java_project_deps %}
-    {{ depCompileName }} project(":{{ proj }}")
-{% endfor %}
-{% for proj in android_project_deps %}
-    {{ depCompileName }} project(path: ":{{ proj }}", configuration: "debug")
-{% endfor %}
-}
-
-{% if template_type.startswith('android') %}
 android.variantFilter { variant ->
     if (variant.buildType.name.equals('release')) {
         variant.setIgnore(true);
@@ -129,6 +75,3 @@ afterEvaluate {
       task.enabled = false
     }
 }
-
-{% endif %}
-{% endif %}

build/android/gradle/dependencies.jinja

+{# 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. #}
+dependencies {
+{% for path in prebuilts %}
+    {{ depCompileName }} files("{{ path }}")
+{% endfor %}
+{% for proj in java_project_deps %}
+    {{ depCompileName }} project(":{{ proj }}")
+{% endfor %}
+{% for proj in android_project_deps %}
+    {{ depCompileName }} project(path: ":{{ proj }}", configuration: "debug")
+{% endfor %}
+}

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'
 _JNI_LIBS_SUBDIR = 'symlinked-libs'
@@ -52,6 +50,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.
 
@@ -90,7 +93,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)
@@ -329,13 +332,13 @@ def _GenerateGradleFile(build_config, build_vars, java_dirs, jni_libs,
           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):
@@ -447,7 +450,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 = []

build/android/gradle/java.jinja

+{# 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. #}
+// Generated by //build/android/generate_gradle.py
+
+apply plugin: "java"
+{% if template_type == 'java_binary' %}
+apply plugin: "application"
+{% endif %}
+
+sourceSets {
+    main {
+        java.srcDirs = [
+{% for path in java_dirs %}
+            "{{ path }}",
+{% endfor %}
+        ]
+    }
+}
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+{% if template_type == 'java_binary' %}
+mainClassName = "{{ main_class }}"
+applicationName = "{{ target_name }}"
+{% endif %}
+{% if template_type in ('java_binary', 'java_library') %}
+archivesBaseName = "{{ target_name }}"
+{% endif %}
+
+{% include 'dependencies.jinja' %}

build/android/gradle/root.jinja

+{# 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. #}
+// Generated by //build/android/generate_gradle.py
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:2.2.3"
+    }
+}

build/android/gyp/jinja_template.py

@@ -37,7 +37,7 @@ class JinjaProcessor(object):
   """Allows easy rendering of jinja templates with input file tracking."""
   def __init__(self, loader_base_dir, variables=None):
     self.loader_base_dir = loader_base_dir
-    self.variables = variables
+    self.variables = variables or {}
     self.loader = _RecordingFileSystemLoader(loader_base_dir)
     self.env = jinja2.Environment(loader=self.loader)
     self.env.undefined = jinja2.StrictUndefined