aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin/android_run_skia
diff options
context:
space:
mode:
authorGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 13:50:38 +0000
committerGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-02 13:50:38 +0000
commitd6bab0238655dbab24dfe92bd0b16b464310a8c7 (patch)
tree664de29dd3b91a1ed1be463f2cd797e871cabec7 /platform_tools/android/bin/android_run_skia
parent5b39f5ba9c339d1e4dae391fee9ec1396feec180 (diff)
Reverting r12427
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/bin/android_run_skia')
-rwxr-xr-xplatform_tools/android/bin/android_run_skia5
1 files changed, 4 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index 3314225ba4..11c36756f5 100755
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -28,7 +28,10 @@ then
fi
adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp
-adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp
+if [ -f "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" ]; then
+ # Does not exist for builds with static skia.
+ adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp
+fi
adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp
STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"