Issue #1751 - Remove Mac code behind MOZ_WIDGET_TOOLKIT == 'cocoa'

toolkit/library/moz.build

@@ -12,14 +12,8 @@ def Libxul_defines():
 
 @template
 def Libxul(name):
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-        # This is going to be a framework named "XUL", not an ordinary library named
-        # "libxul.dylib"
-        GeckoFramework(name, linkage=None)
-        SHARED_LIBRARY_NAME = 'XUL'
-    else:
-        GeckoSharedLibrary(name, linkage=None)
-        SHARED_LIBRARY_NAME = 'xul'
+    GeckoSharedLibrary(name, linkage=None)
+    SHARED_LIBRARY_NAME = 'xul'
 
     DELAYLOAD_DLLS += [
         'comdlg32.dll',
@@ -127,9 +121,6 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] or \
         'freetype',
     ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CXXFLAGS += CONFIG['TK_CFLAGS']
-
 if CONFIG['MOZ_WEBRTC']:
     if CONFIG['OS_TARGET'] == 'WINNT':
         OS_LIBS += [
@@ -143,19 +134,6 @@ if CONFIG['MOZ_WEBRTC']:
             'wininet',
         ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    OS_LIBS += [
-        '-framework OpenGL',
-        '-framework SystemConfiguration',
-        '-framework AVFoundation',
-        '-framework CoreMedia',
-        '-framework IOKit',
-        '-F%s' % CONFIG['MACOS_PRIVATE_FRAMEWORKS_DIR'],
-        '-framework CoreUI',
-        '-framework CoreSymbolication',
-        'cups',
-    ]
-
 if CONFIG['MOZ_WMF']:
     OS_LIBS += [
         'mfuuid',
@@ -218,9 +196,6 @@ if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
 
 OS_LIBS += CONFIG['ICONV_LIBS']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-    OS_LIBS += CONFIG['TK_LIBS']
-
 if CONFIG['MOZ_SNDIO']:
     OS_LIBS += [
         'sndio',
@@ -305,14 +280,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     ]
 
 if CONFIG['COMPILE_ENVIRONMENT']:
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-        full_libname = SHARED_LIBRARY_NAME
-    else:
-        full_libname = '%s%s%s' % (
-            CONFIG['DLL_PREFIX'],
-            LIBRARY_NAME,
-            CONFIG['DLL_SUFFIX']
-        )
+    full_libname = '%s%s%s' % (
+        CONFIG['DLL_PREFIX'],
+        LIBRARY_NAME,
+        CONFIG['DLL_SUFFIX']
+    )
     GENERATED_FILES += ['dependentlibs.list']
     GENERATED_FILES['dependentlibs.list'].script = 'dependentlibs.py:gen_list'
     GENERATED_FILES['dependentlibs.list'].inputs = [