Commit 1f83faba authored by Richard Pospesel's avatar Richard Pospesel Committed by Georg Koppen
Browse files

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.
parent f22e3702

projects/firefox/build

+1 −1
Original line number Diff line number Diff line
@@ -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") %]

projects/firefox/config

+3 −0
Original line number Diff line number Diff line
@@ -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: