Bug 1477487 - Part 0: Make GeckoView more prominent in |mach bootstrap|. r=agi

This is part of the larger shift toward GeckoView and away from
Firefox for Android.  We need GV to "show up" in these kind of
onboarding tools; here's a small first step.

Differential Revision: https://phabricator.services.mozilla.com/D16136

--HG--
extra : moz-landing-system : lando

python/mozboot/mozboot/android.py

@@ -47,7 +47,7 @@ Paste the lines between the chevrons (>>> and <<<) into your
 $topsrcdir/mozconfig file, or create the file if it does not exist:
 
 >>>
-# Build Firefox for Android:
+# Build GeckoView/Firefox for Android:
 ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 
@@ -63,7 +63,7 @@ Paste the lines between the chevrons (>>> and <<<) into your
 $topsrcdir/mozconfig file, or create the file if it does not exist:
 
 >>>
-# Build Firefox for Android Artifact Mode:
+# Build GeckoView/Firefox for Android Artifact Mode:
 ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --enable-artifact-builds

python/mozboot/mozboot/base.py

@@ -216,7 +216,7 @@ class BaseBootstrapper(object):
         Install packages required to build Firefox for Android (application
         'mobile/android', also known as Fennec).
         '''
-        raise NotImplementedError('Cannot bootstrap Firefox for Android: '
+        raise NotImplementedError('Cannot bootstrap GeckoView/Firefox for Android: '
                                   '%s does not yet implement install_mobile_android_packages()'
                                   % __name__)
 
@@ -225,7 +225,7 @@ class BaseBootstrapper(object):
         Print a message to the console detailing what the user's mozconfig
         should contain.
 
-        Firefox for Android needs an application and an ABI set, and it needs
+        GeckoView/Firefox for Android needs an application and an ABI set, and it needs
         paths to the Android SDK and NDK.
         '''
         raise NotImplementedError('%s does not yet implement suggest_mobile_android_mozconfig()' %
@@ -233,11 +233,11 @@ class BaseBootstrapper(object):
 
     def install_mobile_android_artifact_mode_packages(self):
         '''
-        Install packages required to build Firefox for Android (application
+        Install packages required to build GeckoView/Firefox for Android (application
         'mobile/android', also known as Fennec) in Artifact Mode.
         '''
         raise NotImplementedError(
-            'Cannot bootstrap Firefox for Android Artifact Mode: '
+            'Cannot bootstrap GeckoView/Firefox for Android Artifact Mode: '
             '%s does not yet implement install_mobile_android_artifact_mode_packages()'
             % __name__)
 
@@ -246,7 +246,7 @@ class BaseBootstrapper(object):
         Print a message to the console detailing what the user's mozconfig
         should contain.
 
-        Firefox for Android Artifact Mode needs an application and an ABI set,
+        GeckoView/Firefox for Android Artifact Mode needs an application and an ABI set,
         and it needs paths to the Android SDK.
         '''
         raise NotImplementedError(

python/mozboot/mozboot/bootstrap.py

@@ -43,8 +43,8 @@ Artifact builds download prebuilt C++ components rather than building
 them locally. Artifact builds are faster!
 
 Artifact builds are recommended for people working on Firefox or
-Firefox for Android frontends. They are unsuitable for those working
-on C++ code. For more information see:
+Firefox for Android frontends, or the GeckoView Java API. They are unsuitable
+for those working on C++ code. For more information see:
 https://developer.mozilla.org/en-US/docs/Artifact_builds.
 
 Please choose the version of Firefox you want to build:
@@ -54,8 +54,8 @@ Your choice: '''
 APPLICATIONS_LIST = [
     ('Firefox for Desktop Artifact Mode', 'browser_artifact_mode'),
     ('Firefox for Desktop', 'browser'),
-    ('Firefox for Android Artifact Mode', 'mobile_android_artifact_mode'),
-    ('Firefox for Android', 'mobile_android'),
+    ('GeckoView/Firefox for Android Artifact Mode', 'mobile_android_artifact_mode'),
+    ('GeckoView/Firefox for Android', 'mobile_android'),
 ]
 
 # This is a workaround for the fact that we must support python2.6 (which has

python/mozboot/mozboot/osx.py

@@ -111,7 +111,7 @@ We will install a modern version of Clang through %s.
 PACKAGE_MANAGER_CHOICE = '''
 Please choose a package manager you'd like:
 1. Homebrew
-2. MacPorts (Does not yet support bootstrapping Firefox for Android.)
+2. MacPorts (Does not yet support bootstrapping GeckoView/Firefox for Android.)
 Your choice:
 '''
 
@@ -374,7 +374,8 @@ class OSXBootstrapper(BaseBootstrapper):
 
         is_64bits = sys.maxsize > 2**32
         if not is_64bits:
-            raise Exception('You need a 64-bit version of Mac OS X to build Firefox for Android.')
+            raise Exception('You need a 64-bit version of Mac OS X to build '
+                            'GeckoView/Firefox for Android.')
 
         # 2. Android pieces.
         from mozboot import android
@@ -452,7 +453,8 @@ class OSXBootstrapper(BaseBootstrapper):
 
         is_64bits = sys.maxsize > 2**32
         if not is_64bits:
-            raise Exception('You need a 64-bit version of Mac OS X to build Firefox for Android.')
+            raise Exception('You need a 64-bit version of Mac OS X to build '
+                            'GeckoView/Firefox for Android.')
 
         # 2. Android pieces.
         from mozboot import android