Bug 1446809 - Remove some b2g leftover in the build r=glandium
authorSylvestre Ledru <sledru@mozilla.com>
Tue, 20 Mar 2018 10:46:23 +0100
changeset 462786 b909b93e90f9bdde2cefe9c09f55b0c8b68722ef
parent 462785 3dedc3e974318acc9b72fc89d8ce77217c467f21
child 462787 db5c66fc744811eb8984b8b98e8d990145374755
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1446809
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1446809 - Remove some b2g leftover in the build r=glandium MozReview-Commit-ID: EAXd3JmiL2Z
build/docs/mozinfo.rst
build/unix/mozconfig.linux
toolkit/nss.configure
toolkit/toolkit.mozbuild
--- a/build/docs/mozinfo.rst
+++ b/build/docs/mozinfo.rst
@@ -58,17 +58,17 @@ bits
    this key defined.
 
    Optional.
 
 buildapp
    The path to the XUL application being built.
 
    For desktop Firefox, this is ``browser``. For Fennec, it's
-   ``mobile/android``. For B2G, it's ``b2g``.
+   ``mobile/android``.
 
 crashreporter
    Whether the crash reporter is enabled for this build.
 
    Values are ``true`` and ``false``.
 
    Always defined.
 
@@ -109,17 +109,17 @@ nightly_build
    Whether this is a nightly build.
 
    Values are ``true`` and ``false``.
 
    Always defined.
 
 os
    The operating system the build is produced for. Values for tier-1
-   supported platforms are ``linux``, ``win``, ``mac``, ``b2g``, and
+   supported platforms are ``linux``, ``win``, ``mac``, and
    ``android``. For other platforms, the value is the lowercase version
    of the ``OS_TARGET`` variable from ``config.status``.
 
    Always defined.
 
 processor
    Information about the processor architecture this build targets.
 
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -2,26 +2,17 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
 fi
 
 . "$topsrcdir/build/mozconfig.common"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-# some b2g desktop builds still happen on i686 machines, and the tooltool
-# toolchain is x86_64 only.
-# We also deal with valgrind builds here, they don't use tooltool manifests at
-# all yet.
-if [ -z "$no_tooltool" ]
-then
-  CC="$TOOLTOOL_DIR/gcc/bin/gcc"
-  CXX="$TOOLTOOL_DIR/gcc/bin/g++"
+# We deal with valgrind builds here
+CC="$TOOLTOOL_DIR/gcc/bin/gcc"
+CXX="$TOOLTOOL_DIR/gcc/bin/g++"
 
-  # We want to make sure we use binutils and other binaries in the tooltool
-  # package.
-  mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
-else
-  CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
-  CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
-fi
+# We want to make sure we use binutils and other binaries in the tooltool
+# package.
+mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
--- a/toolkit/nss.configure
+++ b/toolkit/nss.configure
@@ -4,13 +4,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 # DBM support in NSS
 # ==============================================================
 @depends(build_project, '--help')
 def dbm_default(build_project, _):
-    return build_project not in ('mobile/android', 'b2g', 'b2g/graphene')
+    return build_project != 'mobile/android'
 
 option('--enable-dbm', default=dbm_default, help='Enable building DBM')
 
 set_config('NSS_DISABLE_DBM', depends('--enable-dbm')(lambda x: not x))
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -36,18 +36,17 @@ if CONFIG['ENABLE_TESTS']:
 DIRS += [
     '/toolkit/library/rust',
 ]
 
 if CONFIG['MOZ_SANDBOX']:
     DIRS += ['/security/sandbox']
 
 DIRS += [
-    # Depends on NSS and NSPR, and must be built after sandbox or else B2G emulator
-    # builds fail.
+    # Depends on NSS and NSPR
     '/security/certverifier',
     # Depends on certverifier
     '/security/apps',
 ]
 
 # the signing related bits of libmar depend on nss
 if CONFIG['MOZ_UPDATER']:
     DIRS += ['/modules/libmar']