Bug 1146042 - Port Bug 1137000 to comm-central - Move sdk building to moz-automation. r=clokep
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 21 Mar 2015 23:14:52 +0100
changeset 28736 13b98804ea47b849e5a672ad6d4af950982d6892
parent 28735 58ace5521e3d44bf66d67b6d66412c20b6d33aef
child 28737 484e7fce0c223f8b886ba2c042ef7c4e304be3ec
push id2283
push usersyshagarwal@gmail.com
push dateMon, 23 Mar 2015 03:25:38 +0000
treeherdertry-comm-central@052a6d9c8bee [default view] [failures only]
reviewersclokep
bugs1146042, 1137000
Bug 1146042 - Port Bug 1137000 to comm-central - Move sdk building to moz-automation. r=clokep
build/macosx/mozconfig.common
build/unix/mozconfig.linux
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -3,16 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_AUTOMATION_L10N_CHECK=0
 
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
+  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 fi
 . "$topsrcdir/build/mozconfig.common"
 
 if [ -d "$topsrcdir/clang" ]; then
     # mozilla-central based build
     export CC=$topsrcdir/clang/bin/clang
     export CXX=$topsrcdir/clang/bin/clang++
     export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -1,12 +1,13 @@
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
+  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 fi
 
 . "$topsrcdir/build/mozconfig.common"
 
 # some b2g desktop builds still happen on i686 machines, and the tooltool
 # toolchain is x86_64 only.
 # We also deal with valgrind builds here, they don't use tooltool manifests at
 # all yet.