Bug 1229341 - Remove .source flag on BRANDING_FILES. r=gps

The only use of BRANDING_FILES[...].source is in xulrunner/app/moz.build, for
the app.ico file.

This file has not been useful since the removal of the xpinstall-based
installer in bug 344236... 9 years ago.

python/mozbuild/mozbuild/frontend/context.py

@@ -24,7 +24,6 @@ from collections import (
 )
 from mozbuild.util import (
     HierarchicalStringList,
-    HierarchicalStringListWithFlagsFactory,
     KeyedDefaultDict,
     List,
     memoize,
@@ -1192,7 +1191,7 @@ VARIABLES = {
         This variable can only be used on Linux.
         """, None),
 
-    'BRANDING_FILES': (HierarchicalStringListWithFlagsFactory({'source': unicode}), list,
+    'BRANDING_FILES': (HierarchicalStringList, list,
         """List of files to be installed into the branding directory.
 
         ``BRANDING_FILES`` will copy (or symlink, if the platform supports it)
@@ -1204,13 +1203,6 @@ VARIABLES = {
 
            BRANDING_FILES += ['foo.png']
            BRANDING_FILES.images.subdir += ['bar.png']
-
-        If the source and destination have different file names, add the
-        destination name to the list and set the ``source`` property on the
-        entry, like so::
-
-           BRANDING_FILES.dir += ['baz.png']
-           BRANDING_FILES.dir['baz.png'].source = 'quux.png'
         """, None),
 
     'SDK_LIBRARY': (bool, bool,

python/mozbuild/mozbuild/test/backend/data/branding-files/moz.build

@@ -2,11 +2,9 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 BRANDING_FILES += [
-    'app.ico',
     'bar.ico',
     'sub/quux.png',
 ]
-BRANDING_FILES['app.ico'].source = 'bar.ico'
 
 BRANDING_FILES.icons += [
     'foo.ico',

python/mozbuild/mozbuild/test/backend/test_recursivemake.py

@@ -416,8 +416,7 @@ class TestRecursiveMakeBackend(BackendTester):
         #BRANDING_FILES should appear in the dist_branding install manifest.
         m = InstallManifest(path=os.path.join(env.topobjdir,
             '_build_manifests', 'install', 'dist_branding'))
-        self.assertEqual(len(m), 4)
-        self.assertIn('app.ico', m)
+        self.assertEqual(len(m), 3)
         self.assertIn('bar.ico', m)
         self.assertIn('quux.png', m)
         self.assertIn('icons/foo.ico', m)

python/mozbuild/mozbuild/test/frontend/data/branding-files/moz.build

@@ -2,12 +2,10 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 BRANDING_FILES += [
-    'app.ico',
     'bar.ico',
     'baz.png',
     'foo.xpm',
 ]
-BRANDING_FILES['app.ico'].source = 'test/bar.ico'
 
 BRANDING_FILES.icons += [
     'quux.icns',

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -290,8 +290,7 @@ class TestEmitterBasic(unittest.TestCase):
 
         files = objs[0].files
 
-        self.assertEqual(files._strings, ['app.ico', 'bar.ico', 'baz.png', 'foo.xpm'])
-        self.assertEqual(files['app.ico'].source, 'test/bar.ico')
+        self.assertEqual(files._strings, ['bar.ico', 'baz.png', 'foo.xpm'])
 
         self.assertIn('icons', files._children)
         icons = files._children['icons']

xulrunner/app/moz.build

@@ -60,11 +60,9 @@ JS_PREFERENCE_PP_FILES += [
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     BRANDING_FILES += [
-        'app.ico',
         'document.ico',
         'xulrunner.ico',
     ]
-    BRANDING_FILES['app.ico'].source = 'xulrunner.ico'
 
 if CONFIG['MOZ_WIDGET_GTK']:
     BRANDING_FILES += [