Merge pull request #22 from walac/bugz/1098336

Bug 1098336: Use mozharness debug flag for emulator debug builds. r=garndt
lightsofapollo · Nov 13, 2014 · 2535daa · 2535daa
2 parents 73bba82 + 699db1a
commit 2535daa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/testing/docker/builder/VERSION b/testing/docker/builder/VERSION
@@ -1 +1 @@
-0.0.17
+0.0.18
diff --git a/testing/docker/builder/bin/build-emulator.sh b/testing/docker/builder/bin/build-emulator.sh
@@ -18,15 +18,21 @@ fi
 OBJDIR="$HOME/object-folder-$B2G_CONFIG-$B2G_DEBUG"
 
 if [ ! -d $OBJDIR ]; then
-    mkdir -p $OBJDIR
+  mkdir -p $OBJDIR
 fi
 
 if [ ! -d $OBJDIR/B2G ]; then
-    git clone https://git.mozilla.org/b2g/B2G.git $OBJDIR/B2G
+  git clone https://git.mozilla.org/b2g/B2G.git $OBJDIR/B2G
+fi
+
+debug_flag=""
+if [ 0$B2G_DEBUG -ne 0 ]; then
+  debug_flag='--debug'
 fi
 
 ./mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-emulator.py \
+  "$debug_flag" \
   --disable-mock \
   --work-dir=$OBJDIR/B2G \
   --log-level=debug \