aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2014-07-11 08:47:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-11 08:47:23 -0700
commitf94bdb84ef267fade449bd154f8c3cef7011896e (patch)
treebb3c527bf69f5dd1453cd4c326e34265afec9998 /platform_tools/android
parenta3fce46f7c85eb3eb5c5373c1eaa0336d9756252 (diff)
explicitly add /data/local/tmp to the library path to support new AOSP restrictions
BUG=skia:2660 R=tomhudson@chromium.org, tomhudson@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/387893003
Diffstat (limited to 'platform_tools/android')
-rwxr-xr-xplatform_tools/android/bin/android_run_skia3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index 7f0105c59b..81c4fee013 100755
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -25,7 +25,8 @@ fi
STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
$ADB ${DEVICE_SERIAL} shell \
- "/data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME}"
+ "LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH \
+ /data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME}"
if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then
echo "***********************************************************************"
echo "The application terminated unexpectedly and did not produce an exit code"