Updating project for ndk 8e/merge from libjingle and webrtc trunk

jakubadamek · Mar 29, 2013 · 75ed5e6 · 75ed5e6
1 parent 202397e
commit 75ed5e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/android/voice-client-core/build.sh b/android/voice-client-core/build.sh
@@ -14,10 +14,7 @@ function usage {
     echo "If you want to specify aditional options for ndk-build, call it: "
     echo "ndk-build NDK_APPLICATION_MK=filename.mk"
 }
-ndk_build_exe=`which ndk-build`
-if [ -f "$ndk_build_exe" ];then
-    echo "Using $ndk_build_exe"
-elif [ -f "$ANDROID_NDK_ROOT/ndk-build" ];then
+if [ -f "$ANDROID_NDK_ROOT/ndk-build" ];then
     echo "Using $ANDROID_NDK_ROOT/ndk-build"
     ndk_build_exe="$ANDROID_NDK_ROOT/ndk-build"
 else

diff --git a/client/voiceclient.h b/client/voiceclient.h
@@ -39,11 +39,11 @@
 #include "talk/session/media/mediamessages.h"
 #include "talk/session/media/mediasessionclient.h"
 #include "talk/xmpp/xmppclient.h"
-#include "talk/examples/login/xmpppump.h"
 #include "talk/base/criticalsection.h"
 
 #include "client/status.h"
 #include "client/xmppmessage.h"
+#include "client/txmpppump.h"
 
 namespace tuenti {
 

diff --git a/tools/badit_android.py b/tools/badit_android.py
@@ -27,7 +27,7 @@
 supportedProfiles = ["video_debug", "video_final", "video_release",
                      "default_debug", "default_release", "default_final",
                      "tuenti_debug", "tuenti_release", "tuenti_final"]
-supportedNDKs = ["r8", "r8d"]
+supportedNDKs = ["r8e", "r8d"]
 
 ##
 ##  The following options are provided.
@@ -198,7 +198,7 @@ def checkNDK():
             ndkRoot = os.environ['ANDROID_NDK_ROOT']
             releaseTxt = os.path.join(ndkRoot, "RELEASE.TXT")
             releaseHandle = open(releaseTxt, 'r')
-            releaseContents = releaseHandle.read().strip()
+            releaseContents = releaseHandle.read(3)
             releaseHandle.close()
         except (KeyError, IOError):
             logger.error("Please set ANDROID_NDK_ROOT")