diff --git a/mobile/android/.eslintrc.js b/mobile/android/.eslintrc.js
index 872785553e13..ef52b1da42fb 100644
--- a/mobile/android/.eslintrc.js
+++ b/mobile/android/.eslintrc.js
@@ -21,8 +21,6 @@ module.exports = {
 
   "overrides": [{
     files: [
-      // Bug 1425047.
-      "chrome/**",
       // Bug 1425048.
       "components/extensions/**",
     ],
@@ -30,6 +28,13 @@ module.exports = {
       "no-unused-vars": "off",
       "no-undef": "off",
     }
+  }, {
+    files: [
+      "chrome/geckoview/*Child.js",
+    ],
+    env: {
+      "mozilla/frame-script": true,
+    },
   }, {
     files: [
       "chrome/geckoview/**",
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index cbf0d34f2635..ee72694dea16 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -23,6 +23,10 @@ XPCOMUtils.defineLazyGetter(this, "WindowEventDispatcher", () =>
   EventDispatcher.for(window)
 );
 
+// This file assumes `warn` and `debug` are imported into scope
+// by the child scripts.
+/* global debug, warn */
+
 /**
  * ModuleManager creates and manages GeckoView modules. Each GeckoView module
  * normally consists of a JSM module file with an optional content module file.
diff --git a/mobile/android/chrome/geckoview/geckoview.xhtml b/mobile/android/chrome/geckoview/geckoview.xhtml
index 4e1a4736ab7e..12a5f9ac7bda 100644
--- a/mobile/android/chrome/geckoview/geckoview.xhtml
+++ b/mobile/android/chrome/geckoview/geckoview.xhtml
@@ -8,6 +8,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://geckoview/content/geckoview.js"/>
   <script>
+    /* import-globals-from geckoview.js */
     window.addEventListener("DOMContentLoaded", startup, { once: true });
   </script>
 </window>