[tor-commits] [tor-messenger-build/master] Update mozconfigs to remove official branding

[sukhbir at torproject.org]

commit d6b4177805bdeb78a24eb841815801cf7e56ae91
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sun Nov 23 10:56:46 2014 +0530

    Update mozconfigs to remove official branding
---
 projects/instantbird/mozconfig-linux-i686   |    4 ----
 projects/instantbird/mozconfig-linux-x86_64 |    4 ----
 projects/instantbird/mozconfig-windows-i686 |    4 ----
 3 files changed, 12 deletions(-)

diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686
index 476ff74..0e79df2 100644
--- a/projects/instantbird/mozconfig-linux-i686
+++ b/projects/instantbird/mozconfig-linux-i686
@@ -1,8 +1,5 @@
 no_tooltool=1
 
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
 export CFLAGS="-m32 -gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-m32 -gdwarf-2"
 export LDFLAGS=-m32
@@ -23,6 +20,5 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
-ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
 ac_add_options --host=i686-linux-gnu
diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64
index f3a4c41..cfd1bb7 100644
--- a/projects/instantbird/mozconfig-linux-x86_64
+++ b/projects/instantbird/mozconfig-linux-x86_64
@@ -1,8 +1,5 @@
 no_tooltool=1
 
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
 export CFLAGS="-gdwarf-2 -Wno-sign-compare"
 export CXXFLAGS="-gdwarf-2"
 
@@ -20,5 +17,4 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
-ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686
index 321c873..f9d1d5e 100644
--- a/projects/instantbird/mozconfig-windows-i686
+++ b/projects/instantbird/mozconfig-windows-i686
@@ -2,9 +2,6 @@ export CROSS_COMPILE=1
 
 no_tooltool=1
 
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
 ac_add_options --target=i686-w64-mingw32
 ac_add_options --enable-default-toolkit=cairo-windows
 ac_add_options --enable-strip
@@ -17,7 +14,6 @@ ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
-ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..
 
 # sandbox currently fail to build with mingw