commit e58ef003be4306bb53a8c11331146f39e4eab31f
author Andrew Hsieh <andrewhsieh@google.com> Thu Aug 08 06:00:54 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 08 06:00:55 2013 +0000
tree d1d9f8d6d47e0c206712002b0b140df6f6acc4f7
parent d5da71a438ffedf9ee77e1823801e0d50bd230ab
parent 38885b14962a43c3542e0cb5f8d55a41f2c93337

Merge "Use python libraries that NDK provides instead of host system's."

build/tools/make-standalone-toolchain.sh

diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh
index 378502e..9264005 100755
--- a/build/tools/make-standalone-toolchain.sh
+++ b/build/tools/make-standalone-toolchain.sh
@@ -265,6 +265,7 @@
     echo '  shift'
     echo 'done'
     echo 'test -z "$output" && output=a.out'
+    echo 'export PYTHONPATH=`dirname $0`/../lib/python2.7/'
     echo '`dirname $0`/python `dirname $0`/ndk-bc2native.py --sysroot=`dirname $0`/../sysroot --abi='$TARGET_ABI' --platform='$PLATFORM' --file $output $output'
   else
     echo 'rem Call bc2native if needed'
@@ -284,6 +285,7 @@
     echo '  if not "%output%" == "" goto :check_done'
     echo '  set output=a.out'
     echo ':check_done'
+    echo 'set PYTHONPATH=%~dp0\\..\\lib\\python2.7\\'
     echo '%~dp0\\python'$HOST_EXE' %~dp0\\ndk-bc2native.py --sysroot=%~dp0\\..\\sysroot --abi='$TARGET_ABI' --platform='$PLATFORM' --file %output% %output%'
   fi
 }