[tbb-commits] [tor-browser-build/master] Bug 28622: Update Tor Browser icon for Android

[gk at torproject.org]

commit 300c55e5e0cf8e24f49959eababd2c7d9fc056ad
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Mar 20 11:11:39 2019 +0000

    Bug 28622: Update Tor Browser icon for Android
---
 projects/firefox/config                  | 6 +++---
 projects/firefox/mozconfig-android-armv7 | 1 -
 projects/firefox/mozconfig-android-x86   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 679aaee..bd09c5f 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -12,7 +12,7 @@ var:
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.5
   torbrowser_update_channel: alpha
-  branding_directory: browser/branding/alpha
+  branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
     - build-essential
@@ -44,14 +44,14 @@ targets:
   release:
     var:
       torbrowser_update_channel: release
-      branding_directory: browser/branding/official
+      branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official'
 
   nightly:
     git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
     tag_gpg_id: 0
     var:
       torbrowser_update_channel: default
-      branding_directory: browser/branding/nightly
+      branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly'
 
   android:
     var:
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index 8cfcc60..dfa3aaf 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle
 ac_add_options --with-android-version=16
-ac_add_options --with-branding=mobile/android/branding/torbrowser
 
 # Android NDK does not contain llvm-config so set clang path in options
 ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
index 1fe0b93..defe5c3 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -11,7 +11,6 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle
 ac_add_options --with-android-version=16
-ac_add_options --with-branding=mobile/android/branding/torbrowser
 
 # Android NDK does not contain llvm-config so set clang path in options
 ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64