AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

various bug fixes.

Browse Source 
1. update mac support for md5
2. update default build to be thumb

(SkipBuildbotRuns)

R=mtklein@google.com

Review URL: https://codereview.chromium.org/23514051

git-svn-id: http://skia.googlecode.com/svn/trunk@11201 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-09-11 16:56:20 +00:00
parent 7aa8044da5
commit 3a98ed7658
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform_tools/android/bin/android_setup.sh
View File

@ -165,7 +165,7 @@ setup_device() {
TARGET_DEVICE=$(cat .android_config)
echo "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
else
TARGET_DEVICE="arm_v7"
TARGET_DEVICE="arm_v7_thumb"
echo "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
fi
fi
@ -264,7 +264,11 @@ adb_pull_if_needed() {
then
#get the MD5 for dst and src
ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_SRC`
HOST_MD5=`md5sum $HOST_DST`
if [ $(uname) == "Darwin" ]; then
HOST_MD5=`md5 -q $HOST_DST`
else
HOST_MD5=`md5sum $HOST_DST`
fi
if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
then
@ -300,7 +304,11 @@ adb_push_if_needed() {
then
#get the MD5 for dst and src
ANDROID_MD5=`$ADB $DEVICE_SERIAL shell md5 $ANDROID_DST`
HOST_MD5=`md5sum $HOST_SRC`
if [ $(uname) == "Darwin" ]; then
HOST_MD5=`md5 -q $HOST_SRC`
else
HOST_MD5=`md5sum $HOST_SRC`
fi
if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ];
then