| Index: build/android/envsetup.sh | 
| =================================================================== | 
| --- build/android/envsetup.sh	(revision 128684) | 
| +++ build/android/envsetup.sh	(working copy) | 
| @@ -49,12 +49,9 @@ | 
|  | 
| export ANDROID_SDK_VERSION="15" | 
|  | 
| -# Add Android SDK/NDK tools to system path. | 
| -export PATH=$PATH:${ANDROID_NDK_ROOT} | 
| -export PATH=$PATH:${ANDROID_SDK_ROOT}/tools | 
| -export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools | 
| +# Add Android SDK's platform-tools to system path. | 
| +export PATH="${PATH}:${ANDROID_SDK_ROOT}/platform-tools/" | 
|  | 
| - | 
| if [ ! -d "${ANDROID_TOOLCHAIN}" ]; then | 
| echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2 | 
| echo "The NDK version might be wrong." >& 2 | 
|  |