[tor-commits] [tor-browser-build/master] Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines

[gk at torproject.org]

commit 1f83faba6016d988303a125abcee67aff63a7142
Author: Richard Pospesel <richard at torproject.org>
Date:   Tue Nov 20 17:15:29 2018 -0800

    Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines
    
    Updated firefox build and config to pass appropriate path for
    tor-browser branding using the --with-branding ./mach configure flag.
---
 projects/firefox/build  | 2 +-
 projects/firefox/config | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index b9d9d5a..6252686 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -158,7 +158,7 @@ fi
 rm -f configure
 rm -f js/src/configure
 
-./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts
+./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %]
 ./mach build --verbose
 
 [% IF c("var/android") %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 639d504..ed63979 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -12,6 +12,7 @@ var:
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.5
   torbrowser_update_channel: alpha
+  branding_directory: browser/branding/alpha
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
     - build-essential
@@ -31,12 +32,14 @@ targets:
   release:
     var:
       torbrowser_update_channel: release
+      branding_directory: browser/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
 
   android-armv7:
     var: