diff --git a/talk/base/systeminfo.cc b/talk/base/systeminfo.cc
index 7cbc418..f63a7ec 100644
--- a/talk/base/systeminfo.cc
+++ b/talk/base/systeminfo.cc
@@ -101,6 +101,8 @@
   cpu_arch_ = ARCH_ARM;
 #elif defined(CPU_X86)
   cpu_arch_ = ARCH_X86;
+#elif defined(__mips__)
+  cpu_arch_ = ARCH_MIPS;
 #else
 #error "Unknown architecture."
 #endif
diff --git a/talk/base/systeminfo.h b/talk/base/systeminfo.h
index cf8e537..5ca450c 100644
--- a/talk/base/systeminfo.h
+++ b/talk/base/systeminfo.h
@@ -39,7 +39,8 @@
   enum Architecture {
     ARCH_X86 = 0,
     ARCH_X64 = 1,
-    ARCH_ARM = 2
+    ARCH_ARM = 2,
+    ARCH_MIPS = 3
   };
 
   SystemInfo();
diff --git a/talk/libjingle.scons b/talk/libjingle.scons
index ff073a0..ae8497a 100644
--- a/talk/libjingle.scons
+++ b/talk/libjingle.scons
@@ -123,7 +123,7 @@
                "EXPAT_RELATIVE_PATH",
                "SRTP_RELATIVE_PATH",
                "XML_STATIC",
-               "HAVE_GIPS",
+               "HAVE_WEBRTC_AUDIO",
              ],
              srcs = [
                "base/asyncfile.cc",
@@ -240,7 +240,6 @@
                "session/phone/devicemanager.cc",
                "session/phone/dummydevicemanager.cc",
                "session/phone/filemediaengine.cc",
-               "session/phone/gipsmediaengine.cc",
                "session/phone/filevideocapturer.cc",
                "session/phone/mediaengine.cc",
                "session/phone/mediamessages.cc",
diff --git a/talk/main.scons b/talk/main.scons
index 6b6b891..7692cd7 100644
--- a/talk/main.scons
+++ b/talk/main.scons
@@ -67,12 +67,15 @@
     'FEATURE_ENABLE_VOICEMAIL',
     'FEATURE_ENABLE_PSTN',
     'HAVE_SRTP',
-    'HAVE_GIPS',
+    'HAVE_WEBRTC_AUDIO',
   ],
   # Ensure the os environment is captured for any scripts we call out to
   ENV = os.environ,
 )
 
+DeclareBit('build_bruno', 'Build in Bruno platform')
+root_env.SetBits('build_bruno')
+
 # This is where we set common environments
 #
 # Detect if building on 64-bit or 32-bit platform.
@@ -489,7 +492,7 @@
     type_suffix = ''
   else:
     groups = groups + ['all-cross']
-    dbg_groups = groups
+    dbg_groups = groups + ['default']
     native_desc = ', cross-built for '
 
   linux_dbg_env = linux_env.Clone(
@@ -614,7 +617,11 @@
 Default(None)
 # Build the following, which excludes unit test output (ie running them)
 # To run unittests, specify the test to run, or run_all_tests.  See -h option.
-Default(['all_libraries', 'all_programs', 'all_test_programs'])
+if root_env.Bit('build_bruno'):
+  # unit test facility is not built in bruno environment so skip the unittest building
+  Default(['all_libraries', 'all_programs'])
+else:
+  Default(['all_libraries', 'all_programs', 'all_test_programs'])
 
 # .sln creation code lifted from googleclient/bar/main.scons.  Must be after
 # the call to BuildEnvironments for all_foo aliases to be defined.