Android: Split up build.gradle.jinja

build/android/gyp/jinja_template.py

Index: build/android/gyp/jinja_template.py
diff --git a/build/android/gyp/jinja_template.py b/build/android/gyp/jinja_template.py
index c8176bdd7854b02bf3f0b0c5683d3b08d71bd6df..af361b81f536745f93a2c8c90ca4b515b52cd803 100755
--- a/build/android/gyp/jinja_template.py
+++ b/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 {}

[agrieve, 2017/01/11 19:51:44]

curious why this was needed?

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

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.

     self.loader = _RecordingFileSystemLoader(loader_base_dir)
     self.env = jinja2.Environment(loader=self.loader)
     self.env.undefined = jinja2.StrictUndefined