Misc cleanups to webrtc/android code:

- Replace some deprecated calls/enums with their more modern equivalents.
- Clean up some usage of global data and/or hide it better
- Catch specific exceptions instead of Exception, and log the exception instead
  of just its message.
- Random log message cleanups
- Added a build_with_libjingle gyp variable to mimic build_with_chromium for
  when webrtc is built as part of a libjingle project but not part of chromium.

BUG=webrtc:1169
TEST=none

Review URL: https://webrtc-codereview.appspot.com/1105010

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3554 4adac7df-926f-26a2-2b94-8c16560cd09d

2 files changed, 3 insertions, 3 deletions

diff --git a/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java b/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
index d45fb810..e2c9921d 100644
--- a/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
+++ b/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
@@ -20,7 +20,7 @@ public class ViERenderer {
     private static SurfaceHolder g_localRenderer;
 
     public static SurfaceView CreateRenderer(Context context) {
-        return  CreateRenderer(context,false);
+        return CreateRenderer(context, false);
     }
 
     public static SurfaceView CreateRenderer(Context context,
@@ -48,7 +48,7 @@ public class ViERenderer {
         SurfaceView localRender = new SurfaceView(context);
         g_localRenderer = localRender.getHolder();
         g_localRenderer.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-        return  localRender;
+        return localRender;
     }
 
     public static SurfaceHolder GetLocalRenderer() {
diff --git a/modules/video_render/android/video_render_android_impl.cc b/modules/video_render/android/video_render_android_impl.cc
index 0107afef..d6f7c5ab 100644
--- a/modules/video_render/android/video_render_android_impl.cc
+++ b/modules/video_render/android/video_render_android_impl.cc
@@ -15,7 +15,7 @@
 #include "thread_wrapper.h"
 #include "tick_util.h"
 
-#ifdef ANDROID_LOG
+#ifdef ANDROID
 #include <stdio.h>
 #include <android/log.h>