Bug 1618411 - Fix installed file conditions on non-Linux platforms using GTK r=dao

TwemojiMozilla.ttf is used on all GTK platforms, not just Linux.

import-export.svg and sort.svg aren't used on GTK platforms, so
they shouldn't be installed for non-Linux GTK platforms.

autocomplete-item.css and editDialog.css are used on all GTK
platforms, not just Linux.

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

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

browser/extensions/formautofill/moz.build

@@ -16,17 +16,17 @@ FINAL_TARGET_FILES.features['formautofill@mozilla.org'] += [
   'schema.json',
 ]
 
-if CONFIG['OS_ARCH'] == 'Linux':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
     FINAL_TARGET_FILES.features['formautofill@mozilla.org'].chrome.res += [
         'skin/linux/autocomplete-item.css',
         'skin/linux/editDialog.css',
     ]
-elif CONFIG['OS_ARCH'] == 'Darwin':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     FINAL_TARGET_FILES.features['formautofill@mozilla.org'].chrome.res += [
         'skin/osx/autocomplete-item.css',
         'skin/osx/editDialog.css',
     ]
-elif CONFIG['OS_ARCH'] == 'WINNT':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     FINAL_TARGET_FILES.features['formautofill@mozilla.org'].chrome.res += [
         'skin/windows/autocomplete-item.css',
         'skin/windows/editDialog.css',

browser/fonts/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
     DIST_SUBDIR = ''
     FINAL_TARGET_FILES.fonts += [
         'TwemojiMozilla.ttf'

browser/installer/package-manifest.in

@@ -48,7 +48,7 @@
 @RESPATH@/dictionaries/*
 @RESPATH@/browser/localization/*
 @RESPATH@/localization/*
-#if defined(XP_WIN) || defined(XP_LINUX)
+#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
 @RESPATH@/fonts/*
 #endif
 @RESPATH@/hyphenation/*

browser/themes/shared/jar.inc.mn

@@ -188,7 +188,7 @@
   skin/classic/browser/fullscreen-exit.svg            (../shared/icons/fullscreen-exit.svg)
   skin/classic/browser/history.svg                    (../shared/icons/history.svg)
   skin/classic/browser/home.svg                       (../shared/icons/home.svg)
-#ifndef XP_LINUX
+#ifndef MOZ_WIDGET_GTK
   skin/classic/browser/import-export.svg              (../shared/icons/import-export.svg)
 #endif
   skin/classic/browser/library.svg                    (../shared/icons/library.svg)
@@ -221,7 +221,7 @@
   skin/classic/browser/sidebars.svg                   (../shared/icons/sidebars.svg)
   skin/classic/browser/sidebars-right.svg             (../shared/icons/sidebars-right.svg)
   skin/classic/browser/sign-out.svg                   (../shared/icons/sign-out.svg)
-#ifndef XP_LINUX
+#ifndef MOZ_WIDGET_GTK
   skin/classic/browser/sort.svg                       (../shared/icons/sort.svg)
 #endif
   skin/classic/browser/stop.svg                       (../shared/icons/stop.svg)