summaryrefslogtreecommitdiffstats
path: root/mobile/android/branding
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-23 15:32:23 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-23 15:32:23 -0400
commitabe80cc31d5a40ebed743085011fbcda0c1a9a10 (patch)
treefb3762f06b84745b182af281abb107b95a9fcf01 /mobile/android/branding
parent63295d0087eb58a6eb34cad324c4c53d1b220491 (diff)
downloadUXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar
UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.gz
UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.lz
UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.tar.xz
UXP-abe80cc31d5a40ebed743085011fbcda0c1a9a10.zip
Issue #1053 - Drop support Android and remove Fennec - Part 1a: Remove mobile/android
Diffstat (limited to 'mobile/android/branding')
-rw-r--r--mobile/android/branding/aurora/configure.sh10
-rw-r--r--mobile/android/branding/aurora/content/about.pngbin18490 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/content/favicon32.pngbin2554 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/content/favicon64.pngbin7298 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/content/jar.mn9
-rw-r--r--mobile/android/branding/aurora/content/moz.build7
-rw-r--r--mobile/android/branding/aurora/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/aurora/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/aurora/locales/jar.mn11
-rw-r--r--mobile/android/branding/aurora/locales/moz.build7
-rw-r--r--mobile/android/branding/aurora/moz.build7
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/icon.pngbin8661 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/large_icon.pngbin23595 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.pngbin13139 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.pngbin6172 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/icon.pngbin14754 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.pngbin42771 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.pngbin20101 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.pngbin10097 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/icon.pngbin23595 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.pngbin26247 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.pngbin30058 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.pngbin20543 -> 0 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.pngbin42775 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/configure.sh10
-rw-r--r--mobile/android/branding/beta/content/about.pngbin20047 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/content/favicon32.pngbin2361 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/content/favicon64.pngbin6632 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/content/jar.mn9
-rw-r--r--mobile/android/branding/beta/content/moz.build7
-rw-r--r--mobile/android/branding/beta/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/beta/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/beta/locales/jar.mn11
-rw-r--r--mobile/android/branding/beta/locales/moz.build7
-rw-r--r--mobile/android/branding/beta/moz.build7
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/icon.pngbin7327 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/large_icon.pngbin18707 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.pngbin13836 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/widget_icon.pngbin6514 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/icon.pngbin14223 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/large_icon.pngbin36645 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.pngbin20826 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.pngbin9929 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/icon.pngbin18707 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.pngbin18461 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.pngbin37201 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.pngbin17359 -> 0 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxxhdpi/icon.pngbin36668 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/configure.sh9
-rw-r--r--mobile/android/branding/nightly/content/about.pngbin18175 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/content/favicon32.pngbin2470 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/content/favicon64.pngbin6981 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/content/jar.mn9
-rw-r--r--mobile/android/branding/nightly/content/moz.build7
-rw-r--r--mobile/android/branding/nightly/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/nightly/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/nightly/locales/jar.mn11
-rw-r--r--mobile/android/branding/nightly/locales/moz.build7
-rw-r--r--mobile/android/branding/nightly/moz.build7
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/icon.pngbin8156 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/large_icon.pngbin21673 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.pngbin13139 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.pngbin3043 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/icon.pngbin14195 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.pngbin40712 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.pngbin20101 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.pngbin4259 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/icon.pngbin21649 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.pngbin26957 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.pngbin30058 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.pngbin6968 -> 0 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.pngbin40615 -> 0 bytes
-rw-r--r--mobile/android/branding/official/configure.sh10
-rw-r--r--mobile/android/branding/official/content/about.pngbin20047 -> 0 bytes
-rw-r--r--mobile/android/branding/official/content/favicon32.pngbin2361 -> 0 bytes
-rw-r--r--mobile/android/branding/official/content/favicon64.pngbin6628 -> 0 bytes
-rw-r--r--mobile/android/branding/official/content/jar.mn9
-rw-r--r--mobile/android/branding/official/content/moz.build7
-rw-r--r--mobile/android/branding/official/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/official/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/official/locales/jar.mn11
-rw-r--r--mobile/android/branding/official/locales/moz.build7
-rw-r--r--mobile/android/branding/official/moz.build7
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/icon.pngbin7902 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/large_icon.pngbin21306 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/launcher_widget.pngbin13305 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/widget_icon.pngbin5977 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/icon.pngbin13891 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/large_icon.pngbin37644 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.pngbin20302 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/widget_icon.pngbin9193 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/icon.pngbin21306 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/large_icon.pngbin21556 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.pngbin29503 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.pngbin16737 -> 0 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxxhdpi/icon.pngbin37610 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/configure.sh9
-rw-r--r--mobile/android/branding/unofficial/content/about.pngbin13042 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/content/favicon32.pngbin1558 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/content/favicon64.pngbin5677 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/content/jar.mn9
-rw-r--r--mobile/android/branding/unofficial/content/moz.build7
-rw-r--r--mobile/android/branding/unofficial/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/unofficial/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/unofficial/locales/jar.mn11
-rw-r--r--mobile/android/branding/unofficial/locales/moz.build7
-rw-r--r--mobile/android/branding/unofficial/moz.build7
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/icon.pngbin6498 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.pngbin17583 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.pngbin13139 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/icon.pngbin10371 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.pngbin17583 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.pngbin20101 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.pngbin4252 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.pngbin17583 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.pngbin17583 -> 0 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.pngbin30058 -> 0 bytes
117 files changed, 0 insertions, 318 deletions
diff --git a/mobile/android/branding/aurora/configure.sh b/mobile/android/branding/aurora/configure.sh
deleted file mode 100644
index 39b9e15c3..000000000
--- a/mobile/android/branding/aurora/configure.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOZ_APP_DISPLAYNAME="Firefox Aurora"
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
-MOZ_UPDATER=1
-MOZ_ANDROID_ANR_REPORTER=1
-MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/aurora/content/about.png b/mobile/android/branding/aurora/content/about.png
deleted file mode 100644
index 3779bd120..000000000
--- a/mobile/android/branding/aurora/content/about.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/content/favicon32.png b/mobile/android/branding/aurora/content/favicon32.png
deleted file mode 100644
index defb22717..000000000
--- a/mobile/android/branding/aurora/content/favicon32.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/content/favicon64.png b/mobile/android/branding/aurora/content/favicon64.png
deleted file mode 100644
index 163782abf..000000000
--- a/mobile/android/branding/aurora/content/favicon64.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/content/jar.mn b/mobile/android/branding/aurora/content/jar.mn
deleted file mode 100644
index e49cc4041..000000000
--- a/mobile/android/branding/aurora/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png (about.png)
- content/branding/favicon32.png (favicon32.png)
- content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/aurora/content/moz.build b/mobile/android/branding/aurora/content/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/aurora/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/aurora/locales/en-US/brand.dtd b/mobile/android/branding/aurora/locales/en-US/brand.dtd
deleted file mode 100644
index a6cada676..000000000
--- a/mobile/android/branding/aurora/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!ENTITY brandShortName "Firefox Aurora">
-<!ENTITY brandFullName "Mozilla Firefox Aurora">
-<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/aurora/locales/en-US/brand.properties b/mobile/android/branding/aurora/locales/en-US/brand.properties
deleted file mode 100644
index fc4afd6d5..000000000
--- a/mobile/android/branding/aurora/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-brandShortName=Aurora
-brandFullName=Mozilla Aurora
diff --git a/mobile/android/branding/aurora/locales/jar.mn b/mobile/android/branding/aurora/locales/jar.mn
deleted file mode 100644
index 5a77695c9..000000000
--- a/mobile/android/branding/aurora/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/aurora/locales/moz.build b/mobile/android/branding/aurora/locales/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/aurora/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/aurora/moz.build b/mobile/android/branding/aurora/moz.build
deleted file mode 100644
index 04084b1ac..000000000
--- a/mobile/android/branding/aurora/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/icon.png
deleted file mode 100644
index 17748ed5e..000000000
--- a/mobile/android/branding/aurora/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index 229ad5e0f..000000000
--- a/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index 8e55b0c11..000000000
--- a/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png
deleted file mode 100644
index 39fdb8204..000000000
--- a/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 51c54bf37..000000000
--- a/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index 78e94d30a..000000000
--- a/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index 56f47446a..000000000
--- a/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index 74e6f8aea..000000000
--- a/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 229ad5e0f..000000000
--- a/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index 5b439392e..000000000
--- a/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index eb88984db..000000000
--- a/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png
deleted file mode 100644
index bb651922f..000000000
--- a/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 27f63fc24..000000000
--- a/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/configure.sh b/mobile/android/branding/beta/configure.sh
deleted file mode 100644
index b8c442a7c..000000000
--- a/mobile/android/branding/beta/configure.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOZ_APP_DISPLAYNAME="Firefox Beta"
-ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
-MOZ_UPDATER=
-MOZ_ANDROID_ANR_REPORTER=
-MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/beta/content/about.png b/mobile/android/branding/beta/content/about.png
deleted file mode 100644
index dc52e843b..000000000
--- a/mobile/android/branding/beta/content/about.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/content/favicon32.png b/mobile/android/branding/beta/content/favicon32.png
deleted file mode 100644
index 63b54a247..000000000
--- a/mobile/android/branding/beta/content/favicon32.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/content/favicon64.png b/mobile/android/branding/beta/content/favicon64.png
deleted file mode 100644
index 2a9eb30d8..000000000
--- a/mobile/android/branding/beta/content/favicon64.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/content/jar.mn b/mobile/android/branding/beta/content/jar.mn
deleted file mode 100644
index e49cc4041..000000000
--- a/mobile/android/branding/beta/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png (about.png)
- content/branding/favicon32.png (favicon32.png)
- content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/beta/content/moz.build b/mobile/android/branding/beta/content/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/beta/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/beta/locales/en-US/brand.dtd b/mobile/android/branding/beta/locales/en-US/brand.dtd
deleted file mode 100644
index 4eb8febf0..000000000
--- a/mobile/android/branding/beta/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!ENTITY brandShortName "Firefox Beta">
-<!ENTITY brandFullName "Mozilla Firefox Beta">
-<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/beta/locales/en-US/brand.properties b/mobile/android/branding/beta/locales/en-US/brand.properties
deleted file mode 100644
index 8d8a8b8e3..000000000
--- a/mobile/android/branding/beta/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-brandShortName=Firefox Beta
-brandFullName=Mozilla Firefox Beta
diff --git a/mobile/android/branding/beta/locales/jar.mn b/mobile/android/branding/beta/locales/jar.mn
deleted file mode 100644
index 2ea47e168..000000000
--- a/mobile/android/branding/beta/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/beta/locales/moz.build b/mobile/android/branding/beta/locales/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/beta/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/beta/moz.build b/mobile/android/branding/beta/moz.build
deleted file mode 100644
index 04084b1ac..000000000
--- a/mobile/android/branding/beta/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/icon.png b/mobile/android/branding/beta/res/drawable-hdpi/icon.png
deleted file mode 100644
index fc450d0fd..000000000
--- a/mobile/android/branding/beta/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index 8b7f313fb..000000000
--- a/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index ba8ba8eed..000000000
--- a/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png
deleted file mode 100644
index 8c60639e2..000000000
--- a/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 7c2af7a0c..000000000
--- a/mobile/android/branding/beta/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index 638d6b5d7..000000000
--- a/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index d15d5b91e..000000000
--- a/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index 5ec6b038e..000000000
--- a/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 8b7f313fb..000000000
--- a/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index 6a25ee0f0..000000000
--- a/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index df75a5b2f..000000000
--- a/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png
deleted file mode 100644
index c4d71316e..000000000
--- a/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 57c81f22c..000000000
--- a/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
deleted file mode 100644
index 399de4c88..000000000
--- a/mobile/android/branding/nightly/configure.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOZ_APP_DISPLAYNAME=Nightly
-MOZ_UPDATER=1
-MOZ_ANDROID_ANR_REPORTER=1
-MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/nightly/content/about.png b/mobile/android/branding/nightly/content/about.png
deleted file mode 100644
index d6602ec62..000000000
--- a/mobile/android/branding/nightly/content/about.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/content/favicon32.png b/mobile/android/branding/nightly/content/favicon32.png
deleted file mode 100644
index 6cf3db69a..000000000
--- a/mobile/android/branding/nightly/content/favicon32.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/content/favicon64.png b/mobile/android/branding/nightly/content/favicon64.png
deleted file mode 100644
index ab340837e..000000000
--- a/mobile/android/branding/nightly/content/favicon64.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/content/jar.mn b/mobile/android/branding/nightly/content/jar.mn
deleted file mode 100644
index e49cc4041..000000000
--- a/mobile/android/branding/nightly/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png (about.png)
- content/branding/favicon32.png (favicon32.png)
- content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/nightly/content/moz.build b/mobile/android/branding/nightly/content/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/nightly/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd
deleted file mode 100644
index 3d3a3a10f..000000000
--- a/mobile/android/branding/nightly/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!ENTITY brandShortName "Nightly">
-<!ENTITY brandFullName "Mozilla Nightly">
-<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties
deleted file mode 100644
index d06053614..000000000
--- a/mobile/android/branding/nightly/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-brandShortName=Nightly
-brandFullName=Mozilla Nightly
diff --git a/mobile/android/branding/nightly/locales/jar.mn b/mobile/android/branding/nightly/locales/jar.mn
deleted file mode 100644
index 5a77695c9..000000000
--- a/mobile/android/branding/nightly/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/nightly/locales/moz.build b/mobile/android/branding/nightly/locales/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/nightly/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/nightly/moz.build b/mobile/android/branding/nightly/moz.build
deleted file mode 100644
index 04084b1ac..000000000
--- a/mobile/android/branding/nightly/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
deleted file mode 100644
index bb87f783b..000000000
--- a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index 0907bbcf1..000000000
--- a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index 8e55b0c11..000000000
--- a/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png
deleted file mode 100644
index f46e29c75..000000000
--- a/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
deleted file mode 100644
index bb78ad623..000000000
--- a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index 3a1f003ba..000000000
--- a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index 56f47446a..000000000
--- a/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index 4413e0c78..000000000
--- a/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 92c3df036..000000000
--- a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index cae9ea289..000000000
--- a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index eb88984db..000000000
--- a/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png
deleted file mode 100644
index 43b679b65..000000000
--- a/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index abd62f1fc..000000000
--- a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh
deleted file mode 100644
index b36e083f9..000000000
--- a/mobile/android/branding/official/configure.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOZ_APP_DISPLAYNAME=Firefox
-ANDROID_PACKAGE_NAME=org.mozilla.firefox
-MOZ_UPDATER=
-MOZ_ANDROID_ANR_REPORTER=
-MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
-MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/official/content/about.png b/mobile/android/branding/official/content/about.png
deleted file mode 100644
index dc52e843b..000000000
--- a/mobile/android/branding/official/content/about.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/content/favicon32.png b/mobile/android/branding/official/content/favicon32.png
deleted file mode 100644
index 63b54a247..000000000
--- a/mobile/android/branding/official/content/favicon32.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/content/favicon64.png b/mobile/android/branding/official/content/favicon64.png
deleted file mode 100644
index e11693d6c..000000000
--- a/mobile/android/branding/official/content/favicon64.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/content/jar.mn b/mobile/android/branding/official/content/jar.mn
deleted file mode 100644
index e49cc4041..000000000
--- a/mobile/android/branding/official/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png (about.png)
- content/branding/favicon32.png (favicon32.png)
- content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/official/content/moz.build b/mobile/android/branding/official/content/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/official/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd
deleted file mode 100644
index b2b28a49a..000000000
--- a/mobile/android/branding/official/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!ENTITY brandShortName "Firefox">
-<!ENTITY brandFullName "Mozilla Firefox">
-<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties
deleted file mode 100644
index d0203e35a..000000000
--- a/mobile/android/branding/official/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-brandShortName=Firefox
-brandFullName=Mozilla Firefox
diff --git a/mobile/android/branding/official/locales/jar.mn b/mobile/android/branding/official/locales/jar.mn
deleted file mode 100644
index 2ea47e168..000000000
--- a/mobile/android/branding/official/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/official/locales/moz.build b/mobile/android/branding/official/locales/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/official/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/official/moz.build b/mobile/android/branding/official/moz.build
deleted file mode 100644
index 04084b1ac..000000000
--- a/mobile/android/branding/official/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/official/res/drawable-hdpi/icon.png b/mobile/android/branding/official/res/drawable-hdpi/icon.png
deleted file mode 100644
index de9052a10..000000000
--- a/mobile/android/branding/official/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index b14cd3d81..000000000
--- a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index 2528f4b35..000000000
--- a/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png
deleted file mode 100644
index 02c88369b..000000000
--- a/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/icon.png b/mobile/android/branding/official/res/drawable-xhdpi/icon.png
deleted file mode 100644
index baee75b77..000000000
--- a/mobile/android/branding/official/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index 20a8c28af..000000000
--- a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index a4d8bdaf5..000000000
--- a/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index 66b933d63..000000000
--- a/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index b14cd3d81..000000000
--- a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index a37b9a83d..000000000
--- a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index 7a5470cb4..000000000
--- a/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png
deleted file mode 100644
index 843ce03a0..000000000
--- a/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 659a33ede..000000000
--- a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/configure.sh b/mobile/android/branding/unofficial/configure.sh
deleted file mode 100644
index 0920151a5..000000000
--- a/mobile/android/branding/unofficial/configure.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER | sed 's/-/_/g'`
-MOZ_APP_DISPLAYNAME="Fennec `echo $USER | sed 's/-/_/g'`"
-MOZ_UPDATER=
-MOZ_ANDROID_ANR_REPORTER=
-MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/unofficial/content/about.png b/mobile/android/branding/unofficial/content/about.png
deleted file mode 100644
index e3f697e8d..000000000
--- a/mobile/android/branding/unofficial/content/about.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/favicon32.png b/mobile/android/branding/unofficial/content/favicon32.png
deleted file mode 100644
index c43d5a229..000000000
--- a/mobile/android/branding/unofficial/content/favicon32.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/favicon64.png b/mobile/android/branding/unofficial/content/favicon64.png
deleted file mode 100644
index 895f60c15..000000000
--- a/mobile/android/branding/unofficial/content/favicon64.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/jar.mn b/mobile/android/branding/unofficial/content/jar.mn
deleted file mode 100644
index e49cc4041..000000000
--- a/mobile/android/branding/unofficial/content/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-chrome.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png (about.png)
- content/branding/favicon32.png (favicon32.png)
- content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/unofficial/content/moz.build b/mobile/android/branding/unofficial/content/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/unofficial/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/locales/en-US/brand.dtd b/mobile/android/branding/unofficial/locales/en-US/brand.dtd
deleted file mode 100644
index 3d998d15c..000000000
--- a/mobile/android/branding/unofficial/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!ENTITY brandShortName "Fennec">
-<!ENTITY brandFullName "Mozilla Fennec">
-<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/locales/en-US/brand.properties b/mobile/android/branding/unofficial/locales/en-US/brand.properties
deleted file mode 100644
index 9cedd01af..000000000
--- a/mobile/android/branding/unofficial/locales/en-US/brand.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-brandShortName=Fennec
-brandFullName=Mozilla Fennec
diff --git a/mobile/android/branding/unofficial/locales/jar.mn b/mobile/android/branding/unofficial/locales/jar.mn
deleted file mode 100644
index 5a77695c9..000000000
--- a/mobile/android/branding/unofficial/locales/jar.mn
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/unofficial/locales/moz.build b/mobile/android/branding/unofficial/locales/moz.build
deleted file mode 100644
index eb4454d28..000000000
--- a/mobile/android/branding/unofficial/locales/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/moz.build b/mobile/android/branding/unofficial/moz.build
deleted file mode 100644
index 04084b1ac..000000000
--- a/mobile/android/branding/unofficial/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
deleted file mode 100644
index 786894f77..000000000
--- a/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png
deleted file mode 100644
index f59604226..000000000
--- a/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png
deleted file mode 100644
index 8e55b0c11..000000000
--- a/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 7ebffe3a5..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png
deleted file mode 100644
index f59604226..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png
deleted file mode 100644
index 56f47446a..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png
deleted file mode 100644
index d5bcf9697..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index f59604226..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png
deleted file mode 100644
index f59604226..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png
+++ /dev/null
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png
deleted file mode 100644
index eb88984db..000000000
--- a/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png
+++ /dev/null
Binary files differ