Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(781)

Unified Diff: platform_tools/android/bin/android_setup.sh

Issue 1136753003: Add android_launch_app script to allow command line options to be passed to the sampleApp when star… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « platform_tools/android/bin/android_launch_app ('k') | site/user/quick/android.md » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index b94d230fb53e2c1bf2a06de7cad83da2b8ef3e03..df002bf9a41f843b848fd2fdfb5d071e67515bc8 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -220,8 +220,14 @@ adb_push_if_needed() {
ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld $ANDROID_DST`
if [ "${ANDROID_LS:0:1}" == "-" ]; then
- #get the MD5 for dst and src
- ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_DST`
+ #get the MD5 for dst and src depending on OS and/or OS revision
+ ANDROID_MD5_SUPPORT=`$ADB $DEVICE_SERIAL shell ls -ld /system/bin/md5`
+ if [ "${ANDROID_MD5_SUPPORT:0:15}" != "/system/bin/md5" ]; then
+ ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_DST`
+ else
+ ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5sum $ANDROID_DST`
+ fi
+
if [ $(uname) == "Darwin" ]; then
HOST_MD5=`md5 -q $HOST_SRC`
else
« no previous file with comments | « platform_tools/android/bin/android_launch_app ('k') | site/user/quick/android.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698