commit 190b72a350304baaf2f19f3f82e185e98eab567b
author kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 15 08:35:49 2014 +0000
committer kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 15 08:35:49 2014 +0000
tree 8fcba797ce980fd94e4475829e1fb6e45cdf0b5a
parent 6e105ede383985ca442d91ae9c5488802e879d8e

Make libjingle Android example build without sourcing envsetup.sh

See https://webrtc-codereview.appspot.com/11799004
for full details (separate to avoid webrtc+talk changes in same CL).

BUG=chromium:346198
TEST=Local builds using:
. build/android/envsetup.sh
unset ANDROID_SDK_ROOT
webrtc/build/gyp_webrtc
ninja -C out/Debug
ninja -C out/Release
+ trybots passing: git try --bot=android,android_rel,android_clang

R=fischman@webrtc.org

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

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

talk/libjingle_examples.gyp

diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index cfae741..0648ec0 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -318,7 +318,8 @@
                 'cp <(PRODUCT_DIR)/libjingle_peerconnection.jar examples/android/libs/ &&'
                 '<(android_strip) -o examples/android/libs/<(android_app_abi)/libjingle_peerconnection_so.so  <(PRODUCT_DIR)/libjingle_peerconnection_so.so &&'
                 'cd examples/android && '
-                '{ ant debug > <(ant_log) 2>&1 || '
+                '{ ANDROID_SDK_ROOT=<(android_sdk_root) '
+                'ant debug > <(ant_log) 2>&1 || '
                 '  { cat <(ant_log) ; exit 1; } } && '
                 'cd - > /dev/null && '
                 'cp examples/android/bin/AppRTCDemo-debug.apk <(_outputs)'