Bug 1638193 - Remove build system support for iOS. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 15 May 2020 03:56:16 +0000
changeset 530224 e0a75c6ae2daf22a2a95c85d4c6256d4d9ea6ad1
parent 530223 95805db3a142ece63d388abec9fd1414ae905a3e
child 530225 2c4692d0b6cbdcfef0ae02bf1c0abb20d96d898d
push id116047
push usermh@glandium.org
push dateFri, 15 May 2020 03:56:53 +0000
treeherderautoland@2c4692d0b6cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1638193
milestone78.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 1638193 - Remove build system support for iOS. r=nalexander iOS support for Gecko has not been tested in years and is most probably out of date. The build system part of it, specifically the checks in build/autoconf/ios.m4, are not trivial to port to python configure, and they prevent other things from moving to python configure (because some of them change value when MOZ_IOS is set). The code is left alone, although it could probably be stripped off as well, but I'll leave that as an exercise for someone else. Differential Revision: https://phabricator.services.mozilla.com/D75463
aclocal.m4
build/autoconf/ios.m4
build/moz.configure/init.configure
build/moz.configure/old.configure
config/external/nspr/pr/moz.build
config/rules.mk
js/src/aclocal.m4
js/src/old-configure.in
old-configure.in
python/mozbuild/mozbuild/configure/constants.py
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
toolkit/moz.configure
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -18,17 +18,16 @@ builtin(include, build/autoconf/mozheade
 builtin(include, build/autoconf/compiler-opts.m4)dnl
 builtin(include, build/autoconf/expandlibs.m4)dnl
 builtin(include, build/autoconf/arch.m4)dnl
 builtin(include, build/autoconf/android.m4)dnl
 builtin(include, build/autoconf/zlib.m4)dnl
 builtin(include, build/autoconf/icu.m4)dnl
 builtin(include, build/autoconf/clang-plugin.m4)dnl
 builtin(include, build/autoconf/alloc.m4)dnl
-builtin(include, build/autoconf/ios.m4)dnl
 builtin(include, build/autoconf/sanitize.m4)dnl
 
 MOZ_PROG_CHECKMSYS()
 
 # Read the user's .mozconfig script.  We can't do this in
 # configure.in: autoconf puts the argument parsing code above anything
 # expanded from configure.in, and we need to get the configure options
 # from .mozconfig in place before that argument parsing code.
deleted file mode 100644
--- a/build/autoconf/ios.m4
+++ /dev/null
@@ -1,107 +0,0 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-AC_DEFUN([MOZ_IOS_PATH_PROG],
-[
-changequote({,})
-_prog_name=ifelse($2, {}, `echo $1 | tr "[:upper:]" "[:lower:]"`, $2)
-changequote([,])
-AC_CACHE_CHECK([for $_prog_name in iOS SDK],
-ac_cv_ios_path_$1,
-[
-_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
-_res=$?
-if test $_res -ne 0; then
-   AC_MSG_ERROR([Could not find '$_prog_name' in the iOS SDK])
-fi
-ac_cv_ios_path_$1=$_path
-])
-$1="${ac_cv_ios_path_$1}$3"
-])
-
-AC_DEFUN([MOZ_IOS_SDK],
-[
-
-MOZ_ARG_WITH_STRING(ios-sdk,
-[  --with-ios-sdk=TYPE
-                          Type of iOS SDK to use (iphonesimulator, iphoneos)
-                          and optionally version (like iphoneos8.2)],
-    ios_sdk=$withval)
-
-MOZ_ARG_ENABLE_STRING(ios-target,
-                      [  --enable-ios-target=VER (default=8.0)
-                          Set the minimum iOS version needed at runtime],
-                      [_IOS_TARGET=$enableval])
-_IOS_TARGET_DEFAULT=8.0
-
-case "$target" in
-arm*-apple-darwin*)
-    if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then
-       ios_sdk=iphoneos
-    fi
-    case "$ios_sdk" in
-         iphoneos*)
-                ios_target_arg="-miphoneos-version-min"
-                ;;
-         *)
-                AC_MSG_ERROR([Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'.])
-                ;;
-    esac
-    ;;
-*-apple-darwin*)
-    ios_target_arg="-mios-simulator-version-min"
-    case "$ios_sdk" in
-         # Empty SDK is okay, this might be an OS X desktop build.
-         ""|iphonesimulator*)
-                ;;
-         # Default to iphonesimulator
-         yes)
-                ios_sdk=iphonesimulator
-                ;;
-         *)
-                AC_MSG_ERROR([Only 'iphonesimulator' SDKs are valid when targeting iOS simulator.])
-                ;;
-    esac
-    ;;
-esac
-
-
-if test -n "$ios_sdk"; then
-   if test -z "$_IOS_TARGET"; then
-      _IOS_TARGET=$_IOS_TARGET_DEFAULT
-      ios_target_arg="${ios_target_arg}=${_IOS_TARGET}"
-   fi
-   # Ensure that xcrun knows where this SDK is.
-   ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null`
-   _ret=$?
-   if test $_ret -ne 0; then
-      AC_MSG_ERROR([iOS SDK '$ios_sdk' could not be found.])
-   fi
-   MOZ_IOS=1
-   export HOST_CC=clang
-   export HOST_CXX=clang++
-   # Add isysroot, arch, and ios target arguments
-   case "$target_cpu" in
-        arm*)
-                ARGS="-arch armv7"
-                ;;
-        *)
-                # Unfortunately simulator builds need this.
-                export CROSS_COMPILE=1
-                ;;
-   esac
-   ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg"
-   # Now find our tools
-   MOZ_IOS_PATH_PROG(CC, clang, $ARGS)
-   MOZ_IOS_PATH_PROG(CXX, clang++, $ARGS)
-   export CPP="$CC -E"
-   MOZ_IOS_PATH_PROG(AR)
-   MOZ_IOS_PATH_PROG(AS, as, $ARGS)
-   MOZ_IOS_PATH_PROG(OTOOL)
-   MOZ_IOS_PATH_PROG(STRIP)
-   export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/
-fi
-
-AC_SUBST(MOZ_IOS)
-])
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -680,19 +680,16 @@ def split_triplet(triplet, allow_msvc=Fa
         canonical_os = canonical_kernel = 'GNU'
     elif os.startswith('mingw') or (allow_msvc and os == 'windows-msvc'):
         # windows-msvc is only opt-in for the caller of this function until
         # full support in bug 1617793.
         canonical_os = canonical_kernel = 'WINNT'
     elif os.startswith('darwin'):
         canonical_kernel = 'Darwin'
         canonical_os = 'OSX'
-    elif os.startswith('ios'):
-        canonical_kernel = 'Darwin'
-        canonical_os = 'iOS'
     elif os.startswith('dragonfly'):
         canonical_os = canonical_kernel = 'DragonFly'
     elif os.startswith('freebsd'):
         canonical_os = canonical_kernel = 'FreeBSD'
     elif os.startswith('netbsd'):
         canonical_os = canonical_kernel = 'NetBSD'
     elif os.startswith('openbsd'):
         canonical_os = canonical_kernel = 'OpenBSD'
@@ -915,20 +912,16 @@ set_config('HOST_MAJOR_VERSION', host_os
 @depends(host)
 def host_for_sub_configure(host):
     return '--host=%s' % host.alias
 
 
 @depends(target)
 def target_for_sub_configure(target):
     target_alias = target.alias
-    # old-configure does plenty of tests against $target and $target_os
-    # and expects darwin for iOS, so make it happy.
-    if target.os == 'iOS':
-        target_alias = target_alias.replace('-ios', '-darwin')
     return '--target=%s' % target_alias
 
 
 # These variables are for compatibility with the current moz.builds and
 # old-configure. Eventually, we'll want to canonicalize better.
 @depends(target)
 def target_variables(target):
     if target.kernel == 'kFreeBSD':
@@ -1005,25 +998,16 @@ def target_is_darwin(target):
     if target.kernel == 'Darwin':
         return True
 
 
 set_define('XP_DARWIN', target_is_darwin)
 
 
 @depends(target)
-def target_is_ios(target):
-    if target.kernel == 'Darwin' and target.os == 'iOS':
-        return True
-
-
-set_define('XP_IOS', target_is_ios)
-
-
-@depends(target)
 def target_is_osx(target):
     if target.kernel == 'Darwin' and target.os == 'OSX':
         return True
 
 
 set_define('XP_MACOSX', target_is_osx)
 
 
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -218,17 +218,16 @@ def old_configure_options(*options):
     '--enable-directshow',
     '--enable-dtrace',
     '--enable-dump-painting',
     '--enable-extensions',
     '--enable-feeds',
     '--enable-gconf',
     '--enable-icf',
     '--enable-install-strip',
-    '--enable-ios-target',
     '--enable-libjpeg-turbo',
     '--enable-libproxy',
     '--enable-llvm-hacks',
     '--enable-logrefcnt',
     '--enable-mobile-optimize',
     '--enable-necko-wifi',
     '--enable-negotiateauth',
     '--enable-nfc',
@@ -260,17 +259,16 @@ def old_configure_options(*options):
     '--with-branding',
     '--with-cross-lib',
     '--with-debug-label',
     '--with-distribution-id',
     '--with-doc-include-dirs',
     '--with-doc-input-dirs',
     '--with-doc-output-dir',
     '--with-intl-api',
-    '--with-ios-sdk',
     '--with-jitreport-granularity',
     '--with-macbundlename-prefix',
     '--with-nspr-cflags',
     '--with-nspr-exec-prefix',
     '--with-nspr-libs',
     '--with-nspr-prefix',
     '--with-nss-exec-prefix',
     '--with-nss-prefix',
--- a/config/external/nspr/pr/moz.build
+++ b/config/external/nspr/pr/moz.build
@@ -46,18 +46,17 @@ elif CONFIG['OS_TARGET'] == 'Darwin':
     DEFINES['DARWIN'] = True
     DEFINES['HAVE_BSD_FLOCK'] = True
     DEFINES['HAVE_SOCKLEN_T'] = True
     DEFINES['HAVE_POINTER_LOCALTIME_R'] = True
     SOURCES += [
         '/nsprpub/pr/src/md/unix/darwin.c',
         '/nsprpub/pr/src/md/unix/os_Darwin.s',
     ]
-    if not CONFIG['MOZ_IOS']:
-        DEFINES['HAVE_CRT_EXTERNS_H'] = True
+    DEFINES['HAVE_CRT_EXTERNS_H'] = True
 elif CONFIG['OS_TARGET'] == 'SunOS':
     DEFINES['HAVE_FCNTL_FILE_LOCKING'] = True
     DEFINES['HAVE_SOCKLEN_T'] = True
     DEFINES['_PR_HAVE_OFF64_T'] = True
     DEFINES['_PR_INET6'] = True
     DEFINES['SOLARIS'] = True
     SOURCES += ['/nsprpub/pr/src/md/unix/solaris.c']
     if CONFIG['CPU_ARCH'] == 'x86_64':
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -302,21 +302,17 @@ HOST_CPP_PROG_LINK	= 1
 endif
 
 #
 # MacOS X specific stuff
 #
 
 ifeq ($(OS_ARCH),Darwin)
 ifdef SHARED_LIBRARY
-ifdef MOZ_IOS
-_LOADER_PATH := @rpath
-else
 _LOADER_PATH := @executable_path
-endif
 EXTRA_DSO_LDOPTS	+= -dynamiclib -install_name $(_LOADER_PATH)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 -single_module
 endif
 endif
 
 #
 # GNU doesn't have path length limitation
 #
 
--- a/js/src/aclocal.m4
+++ b/js/src/aclocal.m4
@@ -18,17 +18,16 @@ builtin(include, ../../build/autoconf/co
 builtin(include, ../../build/autoconf/expandlibs.m4)dnl
 builtin(include, ../../build/autoconf/arch.m4)dnl
 builtin(include, ../../build/autoconf/android.m4)dnl
 builtin(include, ../../build/autoconf/zlib.m4)dnl
 builtin(include, ../../build/autoconf/icu.m4)dnl
 builtin(include, ../../build/autoconf/clang-plugin.m4)dnl
 builtin(include, ../../build/autoconf/alloc.m4)dnl
 builtin(include, ../../build/autoconf/sanitize.m4)dnl
-builtin(include, ../../build/autoconf/ios.m4)dnl
 
 define([__MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE]))
 define([AC_INIT_PREPARE],
 [if test -z "$srcdir"; then
   srcdir=`dirname "[$]0"`
 fi
 srcdir="$srcdir/../.."
 __MOZ_AC_INIT_PREPARE($1)
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -72,22 +72,16 @@ AC_SUBST(autoconfmk)
 if test -n "$JS_STANDALONE"; then
   jsconfdefs=$_objdir/js/src/js-confdefs.h
 else
   jsconfdefs=$_objdir/js-confdefs.h
 fi
 
 MOZ_ANDROID_NDK
 
-case "$target" in
-*-apple-darwin*)
-    MOZ_IOS_SDK
-    ;;
-esac
-
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
 
 if test "$COMPILE_ENVIRONMENT"; then
 
 # Note:
 #   In Mozilla, we use the names $target, $host and $build incorrectly, but are
--- a/old-configure.in
+++ b/old-configure.in
@@ -82,22 +82,16 @@ fi # COMPILE_ENVIRONMENT
 case "$target" in
 *-android*|*-linuxandroid*)
     ;;
 *-linux*)
     AC_PATH_PROG(OBJCOPY,objcopy)
     ;;
 esac
 
-case "$target" in
-*-apple-darwin*)
-    MOZ_IOS_SDK
-    ;;
-esac
-
 AC_SUBST(ANDROID_PACKAGE_NAME)
 AC_SUBST(OBJCOPY)
 
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
 
 if test "$COMPILE_ENVIRONMENT"; then
@@ -526,35 +520,20 @@ dnl System overrides of the defaults for
 dnl ========================================================
 
 case "$target" in
 *-darwin*)
     MOZ_OPTIMIZE_FLAGS="-O3"
     CXXFLAGS="$CXXFLAGS -stdlib=libc++"
     DSO_LDOPTS=''
     STRIP_FLAGS="$STRIP_FLAGS -x -S"
-    # Ensure that if we're targeting iOS an SDK was provided.
-    AC_CACHE_CHECK(for iOS target,
-                   ac_cv_ios_target,
-                   [AC_TRY_COMPILE([#include <TargetConditionals.h>
-#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
-#error not iOS
-#endif],
-                                   [],
-                                   ac_cv_ios_target="yes",
-                                   ac_cv_ios_target="no")])
-    if test "$ac_cv_ios_target" = "yes" -a -z $MOZ_IOS; then
-       AC_MSG_ERROR([targeting iOS but not using an iOS SDK?])
-    fi
-    if test -z "$MOZ_IOS"; then
-        # The ExceptionHandling framework is needed for Objective-C exception
-        # logging code in nsObjCExceptions.h. Currently we only use that in debug
-        # builds.
-        MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
-    fi
+    # The ExceptionHandling framework is needed for Objective-C exception
+    # logging code in nsObjCExceptions.h. Currently we only use that in debug
+    # builds.
+    MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
 
     dnl DTrace and -dead_strip don't interact well. See bug 403132.
     dnl ===================================================================
     if test "x$enable_dtrace" = "xyes"; then
         echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."
     else
         dnl check for the presence of the -dead_strip linker flag
         AC_MSG_CHECKING([for -dead_strip option to ld])
@@ -1579,19 +1558,16 @@ dnl =
 dnl ========================================================
 
 MOZ_ARG_HEADER(Application)
 
 ENABLE_SYSTEM_EXTENSION_DIRS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_AUTH_EXTENSION=1
-if test "$MOZ_IOS"; then
-   MOZ_AUTH_EXTENSION=
-fi
 MOZ_PREF_EXTENSIONS=1
 MOZ_SPELLCHECK=1
 MOZ_UNIVERSALCHARDET=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 MOZ_NO_SMART_CARDS=
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
@@ -1891,20 +1867,16 @@ dnl ====================================
 dnl NegotiateAuth
 dnl ========================================================
 
 MOZ_ARG_DISABLE_BOOL(negotiateauth,
 [  --disable-negotiateauth Disable GSS-API negotiation ],
     MOZ_AUTH_EXTENSION=,
     MOZ_AUTH_EXTENSION=1 )
 
-if test -n "$MOZ_IOS" -a -n "$MOZ_AUTH_EXTENSION"; then
-   AC_MSG_ERROR([negotiateauth is not supported on iOS.])
-fi
-
 dnl ========================================================
 dnl Pref extensions (autoconfig)
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(pref-extensions,
 [  --disable-pref-extensions
                           Disable pref extensions such as autoconfig],
   MOZ_PREF_EXTENSIONS=,
   MOZ_PREF_EXTENSIONS=1 )
@@ -1956,19 +1928,17 @@ dnl ====================================
 dnl = Breakpad crash reporting (on by default on supported platforms)
 dnl ========================================================
 
 case $target in
 i?86-*-mingw*|x86_64-*-mingw*|aarch64-*-mingw*)
   MOZ_CRASHREPORTER=1
   ;;
 i?86-apple-darwin*|x86_64-apple-darwin*)
-  if test -z "$MOZ_IOS"; then
-    MOZ_CRASHREPORTER=1
-  fi
+  MOZ_CRASHREPORTER=1
   ;;
 *-android*|*-linuxandroid*)
   dnl Android/arm is arm-unknown-linux-androideabi, so android condition should
   dnl be before Linux condition
   MOZ_CRASHREPORTER=1
   ;;
 i?86-*-linux*|x86_64-*-linux*|arm-*-linux*)
   if test "$MOZ_ENABLE_GTK"; then
@@ -2050,20 +2020,16 @@ fi
 
 AC_CHECK_PROGS(WGET, wget, "")
 AC_SUBST(WGET)
 
 dnl ========================================================
 dnl Updater
 dnl ========================================================
 
-if test "$MOZ_IOS"; then
-  MOZ_UPDATER=
-fi
-
 MOZ_ARG_DISABLE_BOOL(updater,
 [  --disable-updater       Disable building of updater],
     MOZ_UPDATER=,
     MOZ_UPDATER=1 )
 
 if test -n "$MOZ_UPDATER"; then
     AC_DEFINE(MOZ_UPDATER)
 fi
@@ -2674,19 +2640,17 @@ dnl ====================================
 dnl
 dnl option to disable necko's wifi scanner
 dnl
 
 if test "$MOZ_WIDGET_TOOLKIT"; then
 
   case "$OS_TARGET" in
     Darwin)
-      if test -z "$MOZ_IOS"; then
-	NECKO_WIFI=1
-      fi
+      NECKO_WIFI=1
       ;;
     DragonFly|FreeBSD|WINNT)
       NECKO_WIFI=1
       ;;
     Linux)
       NECKO_WIFI=1
       NECKO_WIFI_DBUS=1
       ;;
--- a/python/mozbuild/mozbuild/configure/constants.py
+++ b/python/mozbuild/mozbuild/configure/constants.py
@@ -15,17 +15,16 @@ CompilerType = EnumString.subclass(
     'msvc',
 )
 
 OS = EnumString.subclass(
     'Android',
     'DragonFly',
     'FreeBSD',
     'GNU',
-    'iOS',
     'NetBSD',
     'OpenBSD',
     'OSX',
     'SunOS',
     'WINNT',
 )
 
 Kernel = EnumString.subclass(
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -1739,20 +1739,16 @@ class RustTest(BaseConfigureTest):
             'x86_64-unknown-netbsd',
             'i686-unknown-openbsd',
             'x86_64-unknown-openbsd',
             'aarch64-unknown-linux-gnu',
             'sparc64-unknown-linux-gnu',
             'i686-unknown-linux-gnu',
             'i686-apple-darwin',
             'x86_64-apple-darwin',
-            'aarch64-apple-ios',
-            'armv7s-apple-ios',
-            'i386-apple-ios',
-            'x86_64-apple-ios',
             'mips-unknown-linux-gnu',
             'mipsel-unknown-linux-gnu',
             'mips64-unknown-linux-gnuabi64',
             'mips64el-unknown-linux-gnuabi64',
             'powerpc64-unknown-linux-gnu',
             'powerpc64le-unknown-linux-gnu',
         ):
             self.assertEqual(self.get_rust_target(straightforward), straightforward)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -156,17 +156,17 @@ jack = pkg_check_modules('MOZ_JACK', 'ja
 
 set_config('MOZ_JACK', depends_if(jack)(lambda _: True))
 set_define('MOZ_JACK', depends_if(jack)(lambda _: True))
 
 # PulseAudio cubeb backend
 # ==============================================================
 @depends(target)
 def pulseaudio_default(target):
-    return target.os not in ('WINNT', 'OSX', 'iOS', 'Android', 'OpenBSD')
+    return target.os not in ('WINNT', 'OSX', 'Android', 'OpenBSD')
 
 option('--enable-pulseaudio', env='MOZ_PULSEAUDIO', default=pulseaudio_default,
        help='{Enable|Disable} PulseAudio audio backend.')
 
 pulseaudio = pkg_check_modules('MOZ_PULSEAUDIO', 'libpulse', when='--enable-pulseaudio')
 
 set_config('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
 set_define('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
@@ -219,18 +219,16 @@ set_config('L10NBASEDIR', l10n_base)
 # Default toolkit
 # ==============================================================
 @depends(target)
 def toolkit_choices(target):
     if target.os == 'WINNT':
         return ('cairo-windows',)
     elif target.os == 'OSX':
         return ('cairo-cocoa',)
-    elif target.os == 'iOS':
-        return ('cairo-uikit',)
     elif target.os == 'Android':
         return ('cairo-android',)
     else:
         return ('cairo-gtk3', 'cairo-gtk3-wayland')
 
 @depends(toolkit_choices)
 def toolkit_default(choices):
     return choices[0]
@@ -535,17 +533,17 @@ def openmax(value):
 set_config('MOZ_OMX', openmax)
 set_define('MOZ_OMX', openmax)
 
 # EME Support
 # ==============================================================
 @depends(target)
 def eme_choices(target):
     if (target.kernel in ('Darwin', 'WINNT', 'Linux') and
-        target.os not in ('Android', 'iOS') and
+        target.os != 'Android' and
         target.cpu in ('x86', 'x86_64')):
         return ('widevine',)
     if target.kernel == 'WINNT' and target.cpu == 'aarch64':
         return ('widevine',)
 
 
 # Widevine is enabled by default in desktop browser builds, except
 # on aarch64 Windows.
@@ -733,23 +731,16 @@ def app_system_headers(value):
     if value:
         return True
 
 set_config('MOZ_APP_SYSTEM_HEADERS', app_system_headers)
 set_define('MOZ_APP_SYSTEM_HEADERS', app_system_headers)
 
 # Printing
 # ==============================================================
-@depends(target)
-def ios_disable_printing(target):
-    if target.os == 'iOS':
-        return False
-
-imply_option('--enable-printing', ios_disable_printing, reason='--target')
-
 option('--disable-printing', help='Disable printing support')
 
 @depends('--disable-printing')
 def printing(value):
     if value:
         return True
 
 set_config('NS_PRINTING', printing)