Android: Permanent fix for jinja templates

Follow-up to https://crrev.com/c/1134884 now that all jinja_template
targets have proper includes.

Bug: 843562
Change-Id: Ibff629fe42644a21a4c9b1fe94a0e5e822168936
Reviewed-on: https://chromium-review.googlesource.com/1135711
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574918}

build/android/gyp/jinja_template.py

@@ -152,11 +152,9 @@ def main():
     all_inputs.difference_update(inputs)
     all_inputs.difference_update(includes)
     if all_inputs:
-      # TODO(agrieve): Change this to an exception once downstream violations
-      #     are fixed. https://crbug.com/843562
-      print ('Found files not listed via --includes:\n' +
+      raise Exception('Found files not listed via --includes:\n' +
                       '\n'.join(sorted(all_inputs)))
-    build_utils.WriteDepfile(options.depfile, output, inputs=list(all_inputs))
+    build_utils.WriteDepfile(options.depfile, output)
 
 
 if __name__ == '__main__':

chrome/android/BUILD.gn

@@ -1356,6 +1356,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
 
 jinja_template("monochrome_public_test_ar_apk_manifest") {
   input = "javatests/AndroidManifest_monochrome.xml"
+  includes = [ "javatests/AndroidManifest.xml" ]
   output = monochrome_public_test_ar_apk_manifest
   variables = chrome_public_jinja_variables +
               monochrome_android_manifest_jinja_variables +