[tbb-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.

gk at torproject.org gk at torproject.org
Fri Jul 27 08:37:27 UTC 2018


commit ce3ad196040db4886e953cf13fc8d24fdf712d4b
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri Feb 2 17:04:11 2018 +0000

    Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
    
    Based on Orfox initial commits with fixup commits squashed and
    rebranding Orfox -> Tor Browser
    
    See original source from ce3fab3c90eb4a3892181ee36b037da04c785d99
    https://github.com/guardianproject/tor-browser.git
    
    Dropped symlinks
---
 .mozconfig-android                                 |  38 +++++++++++++++++++++
 .../android/base/locales/en-US/android_strings.dtd |   2 +-
 mobile/android/branding/torbrowser/configure.sh    |   8 +++++
 .../android/branding/torbrowser/content/about.png  | Bin 0 -> 16858 bytes
 .../branding/torbrowser/content/favicon32.png      | Bin 0 -> 1797 bytes
 .../branding/torbrowser/content/favicon64.png      | Bin 0 -> 3993 bytes
 mobile/android/branding/torbrowser/content/jar.mn  |   9 +++++
 .../android/branding/torbrowser/content/moz.build  |   7 ++++
 mobile/android/branding/torbrowser/ic_launcher.zip | Bin 0 -> 96525 bytes
 mobile/android/branding/torbrowser/icon.png        | Bin 0 -> 36456 bytes
 .../branding/torbrowser/locales/Makefile.in        |   5 +++
 .../branding/torbrowser/locales/en-US/brand.dtd    |   9 +++++
 .../torbrowser/locales/en-US/brand.properties      |   7 ++++
 mobile/android/branding/torbrowser/locales/jar.mn  |  11 ++++++
 .../android/branding/torbrowser/locales/moz.build  |   7 ++++
 mobile/android/branding/torbrowser/moz.build       |   7 ++++
 .../branding/torbrowser/res/drawable-hdpi/icon.png | Bin 0 -> 3549 bytes
 .../torbrowser/res/drawable-hdpi/large_icon.png    | Bin 0 -> 9558 bytes
 .../res/drawable-hdpi/launcher_widget.png          | Bin 0 -> 14001 bytes
 .../branding/torbrowser/res/drawable-mdpi/icon.png | Bin 0 -> 2577 bytes
 .../torbrowser/res/drawable-mdpi/large_icon.png    | Bin 0 -> 5878 bytes
 .../res/drawable-mdpi/launcher_widget.png          | Bin 0 -> 7661 bytes
 .../res/drawable-nodpi/firstrun_welcome.png        | Bin 0 -> 48391 bytes
 .../torbrowser/res/drawable-xhdpi/icon.png         | Bin 0 -> 5878 bytes
 .../torbrowser/res/drawable-xhdpi/large_icon.png   | Bin 0 -> 13553 bytes
 .../res/drawable-xhdpi/launcher_widget.png         | Bin 0 -> 21223 bytes
 .../torbrowser/res/drawable-xhdpi/widget_icon.png  | Bin 0 -> 4381 bytes
 .../torbrowser/res/drawable-xxhdpi/icon.png        | Bin 0 -> 9558 bytes
 .../torbrowser/res/drawable-xxhdpi/large_icon.png  | Bin 0 -> 13553 bytes
 .../res/drawable-xxhdpi/launcher_widget.png        | Bin 0 -> 32686 bytes
 .../torbrowser/res/drawable-xxxhdpi/icon.png       | Bin 0 -> 13553 bytes
 mobile/android/branding/torbrowser/torbrowser.png  | Bin 0 -> 55962 bytes
 mobile/android/branding/torbrowser/torbrowser.xcf  | Bin 0 -> 267775 bytes
 .../mozharness/mozilla/testing/testbase.py         |   7 ++--
 34 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/.mozconfig-android b/.mozconfig-android
new file mode 100755
index 000000000000..efcb1c5415c2
--- /dev/null
+++ b/.mozconfig-android
@@ -0,0 +1,38 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+mk_add_options MOZILLA_OFFICIAL=1
+
+ac_add_options --enable-optimize
+ac_add_options --enable-official-branding
+
+# Android
+ac_add_options --enable-application=mobile/android
+ac_add_options --target=arm-linux-androideabi
+ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r15c)
+ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location
+ac_add_options --with-branding=mobile/android/branding/torbrowser
+
+if [ -n "${TB_BUILD_WITH_DISTRIBUTION}" ]; then
+    ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
+fi
+
+#enable ccache to set amount of cache assigned for build.
+ac_add_options --with-ccache
+
+ac_add_options --disable-tor-browser-update
+ac_add_options --disable-signmar
+ac_add_options --disable-verify-mar
+
+ac_add_options --enable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-rust-debug
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
+
+ac_add_options --without-google-play-services
+
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
+ac_add_options --disable-eme
+#ac_add_options --disable-ctypes
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 917ed534fc9f..b4e2296268c1 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -4,7 +4,7 @@
 
 <!ENTITY firstrun_panel_title_welcome "Welcome">
 <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;">
-<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web.">
+<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web.">
 <!ENTITY firstrun_panel_title_privacy "Privacy">
 <!ENTITY firstrun_privacy_message "Browse like no one\'s watching">
 <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing.">
diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh
new file mode 100644
index 000000000000..79b7e718cbfd
--- /dev/null
+++ b/mobile/android/branding/torbrowser/configure.sh
@@ -0,0 +1,8 @@
+# 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.torproject.torbrowser
+MOZ_APP_DISPLAYNAME="Tor Browser for Android"
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
diff --git a/mobile/android/branding/torbrowser/content/about.png b/mobile/android/branding/torbrowser/content/about.png
new file mode 100644
index 000000000000..3819f6337a17
Binary files /dev/null and b/mobile/android/branding/torbrowser/content/about.png differ
diff --git a/mobile/android/branding/torbrowser/content/favicon32.png b/mobile/android/branding/torbrowser/content/favicon32.png
new file mode 100644
index 000000000000..0c414d6ca46b
Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon32.png differ
diff --git a/mobile/android/branding/torbrowser/content/favicon64.png b/mobile/android/branding/torbrowser/content/favicon64.png
new file mode 100644
index 000000000000..bfc9e05538c6
Binary files /dev/null and b/mobile/android/branding/torbrowser/content/favicon64.png differ
diff --git a/mobile/android/branding/torbrowser/content/jar.mn b/mobile/android/branding/torbrowser/content/jar.mn
new file mode 100644
index 000000000000..f934ed5e4634
--- /dev/null
+++ b/mobile/android/branding/torbrowser/content/jar.mn
@@ -0,0 +1,9 @@
+# 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/
+  content/branding/about.png                     (about.png)
+  content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
diff --git a/mobile/android/branding/torbrowser/content/moz.build b/mobile/android/branding/torbrowser/content/moz.build
new file mode 100644
index 000000000000..3bbe6729759c
--- /dev/null
+++ b/mobile/android/branding/torbrowser/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; 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']
diff --git a/mobile/android/branding/torbrowser/ic_launcher.zip b/mobile/android/branding/torbrowser/ic_launcher.zip
new file mode 100644
index 000000000000..69601344519e
Binary files /dev/null and b/mobile/android/branding/torbrowser/ic_launcher.zip differ
diff --git a/mobile/android/branding/torbrowser/icon.png b/mobile/android/branding/torbrowser/icon.png
new file mode 100644
index 000000000000..6e0051b95a32
Binary files /dev/null and b/mobile/android/branding/torbrowser/icon.png differ
diff --git a/mobile/android/branding/torbrowser/locales/Makefile.in b/mobile/android/branding/torbrowser/locales/Makefile.in
new file mode 100644
index 000000000000..82f614ecea29
--- /dev/null
+++ b/mobile/android/branding/torbrowser/locales/Makefile.in
@@ -0,0 +1,5 @@
+# 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/.
+
+DEFINES += -DAB_CD=$(AB_CD)
diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.dtd b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd
new file mode 100644
index 000000000000..01346be36a7c
--- /dev/null
+++ b/mobile/android/branding/torbrowser/locales/en-US/brand.dtd
@@ -0,0 +1,9 @@
+<!-- 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  "Tor Browser">
+<!ENTITY  brandFullName   "Tor Browser for Android">
+<!ENTITY  vendorShortName "The Tor Project">
+
+<!ENTITY  brandPocket     "">
diff --git a/mobile/android/branding/torbrowser/locales/en-US/brand.properties b/mobile/android/branding/torbrowser/locales/en-US/brand.properties
new file mode 100644
index 000000000000..3015d2376518
--- /dev/null
+++ b/mobile/android/branding/torbrowser/locales/en-US/brand.properties
@@ -0,0 +1,7 @@
+# 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/.
+
+#filter
+brandShortName=Tor Browser
+brandFullName=Tor Browser for Android
diff --git a/mobile/android/branding/torbrowser/locales/jar.mn b/mobile/android/branding/torbrowser/locales/jar.mn
new file mode 100644
index 000000000000..825dabbfb470
--- /dev/null
+++ b/mobile/android/branding/torbrowser/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/.
+
+
+ at 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/torbrowser/locales/moz.build b/mobile/android/branding/torbrowser/locales/moz.build
new file mode 100644
index 000000000000..3bbe6729759c
--- /dev/null
+++ b/mobile/android/branding/torbrowser/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; 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']
diff --git a/mobile/android/branding/torbrowser/moz.build b/mobile/android/branding/torbrowser/moz.build
new file mode 100644
index 000000000000..8f320daeae90
--- /dev/null
+++ b/mobile/android/branding/torbrowser/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; 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/torbrowser/res/drawable-hdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000000..2a1dc9aea83d
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000000..946e03e42d0b
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/large_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000000..4d7dc659a565
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-hdpi/launcher_widget.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png
new file mode 100644
index 000000000000..78ace1c9b6d3
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png
new file mode 100644
index 000000000000..8e45a100870b
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/large_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png
new file mode 100644
index 000000000000..23d966478fdf
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-mdpi/launcher_widget.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png
new file mode 100644
index 000000000000..e4e84187e891
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-nodpi/firstrun_welcome.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000000..8e45a100870b
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000000..d3a4929e7503
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/large_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000000..beff04f1fc1d
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/launcher_widget.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000000..ef76eb342035
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xhdpi/widget_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000000..946e03e42d0b
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000000..d3a4929e7503
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/large_icon.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000000..279af3fff38b
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxhdpi/launcher_widget.png differ
diff --git a/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000000..d3a4929e7503
Binary files /dev/null and b/mobile/android/branding/torbrowser/res/drawable-xxxhdpi/icon.png differ
diff --git a/mobile/android/branding/torbrowser/torbrowser.png b/mobile/android/branding/torbrowser/torbrowser.png
new file mode 100644
index 000000000000..6c6d906aa044
Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.png differ
diff --git a/mobile/android/branding/torbrowser/torbrowser.xcf b/mobile/android/branding/torbrowser/torbrowser.xcf
new file mode 100644
index 000000000000..2a8f829c3c34
Binary files /dev/null and b/mobile/android/branding/torbrowser/torbrowser.xcf differ
diff --git a/testing/mozharness/mozharness/mozilla/testing/testbase.py b/testing/mozharness/mozharness/mozilla/testing/testbase.py
index 558c629363f8..1e5c9507a2b3 100755
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -566,8 +566,11 @@ You can set this by:
             self._download_test_packages(suite_categories, extract_dirs)
 
         self._download_installer()
-        if self.config.get('download_symbols'):
-            self._download_and_extract_symbols()
+        # When using --disable-crashreporter the symbols file
+        # "target.crashreporter-symbols.zip" won't be created,
+        # so we shouldn't try downloading it (and fail).
+        #if self.config.get('download_symbols'):
+        #    self._download_and_extract_symbols()
 
     # create_virtualenv is in VirtualenvMixin.
 





More information about the tbb-commits mailing list