Bug 1155013 - Remove the unset lines in mozconfigs to use the SOCORRO api keys. r+a=KaiRo in a CLOSED TREE RELEASE_41_END
authorEdmund Wong <ewong@pw-wspx.org>
Sat, 24 Oct 2015 08:49:32 +0800
changeset 26319 ccff86886eec0fae67ab7ebdf2c814d297a51605
parent 26318 0277ad235ac9e39fefe9ef5dc2d0a27e13615727
child 26320 e74fdb7e0c1ef9af5e153c8260a86f571e91d132
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1155013
Bug 1155013 - Remove the unset lines in mozconfigs to use the SOCORRO api keys. r+a=KaiRo in a CLOSED TREE
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/macosx-universal/nightly
suite/config/mozconfigs/win32/nightly
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -8,20 +8,16 @@ ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-# Bug 1155007 temporary workaround. Needs to be
-# backed out once we get a Socorro token generated.
-unset SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
-
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -9,20 +9,16 @@ ac_add_options --disable-debug
 ac_add_options --enable-tests
 ac_add_options --disable-elf-hack
 ac_add_options --enable-profiling
 
 export LDFLAGS="-DYUV_DISABLE_ASM=1"
 export CFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 export CXXFLAGS="-gdwarf-2 -DYUV_DISABLE_ASM=1"
 
-# Bug 1155007 temporary workaround. Needs to be
-# backed out once we get a Socorro token generated.
-unset SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
-
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
--- a/suite/config/mozconfigs/macosx-universal/nightly
+++ b/suite/config/mozconfigs/macosx-universal/nightly
@@ -14,18 +14,14 @@ ac_add_options --enable-update-channel=$
 ac_add_options --enable-update-packaging
 ac_add_options --enable-tests
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 
 export CFLAGS="-gdwarf-2"
 export CXXFLAGS="-gdwarf-2"
 
-# Bug 1155007 temporary workaround. Needs to be
-# backed out once we get a Socorro token generated.
-unset SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
-
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-debug-symbols="-gdwarf-2"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/win32/nightly
+++ b/suite/config/mozconfigs/win32/nightly
@@ -2,20 +2,16 @@
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-tests
 ac_add_options --enable-profiling
 
-# Bug 1155007 temporary workaround. Needs to be
-# backed out once we get a Socorro token generated.
-unset SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
-
 # Windows 8 SDK is required for gamepad support
 # bug 1005630
 ac_add_options --disable-gamepad
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini