Merge branch 'master' of https://github.com/servo/servo into font_style

2 files changed, 9 insertions, 5 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index aafaa815af1..78d9fb51318 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -64,10 +64,7 @@ class MachCommands(CommandBase):
             with cd(path.join(apk_builder_dir, "apk-builder")):
                 subprocess.call(["cargo", "build"], env=self.build_env())
 
-            # FIXME: This can be simplified when glutin becomes the default
-            #        and glfw has been removed.
-            opts += ["--target", "arm-linux-androideabi", "--no-default-features"]
-            features += ["glutin"]
+            opts += ["--target", "arm-linux-androideabi"]
 
         if debug_mozjs or self.config["build"]["debug-mozjs"]:
             features += ["script/debugmozjs"]
diff --git a/python/tidy.py b/python/tidy.py
index da930eea333..fc282aaa464 100644
--- a/python/tidy.py
+++ b/python/tidy.py
@@ -56,6 +56,13 @@ def check_license(contents):
         yield (1, "incorrect license")
 
 
+def check_length(contents):
+    lines = contents.splitlines(True)
+    for idx, line in enumerate(lines):
+        if len(line) >= 160:
+            yield (idx + 1, "(much) overlong line")
+
+
 def check_whitespace(contents):
     lines = contents.splitlines(True)
     for idx, line in enumerate(lines):
@@ -88,7 +95,7 @@ def scan():
     all_files = collect_file_names(directories_to_check)
     files_to_check = filter(should_check, all_files)
 
-    checking_functions = [check_license, check_whitespace]
+    checking_functions = [check_license, check_length, check_whitespace]
     errors = collect_errors_for_files(files_to_check, checking_functions)
     errors = list(errors)