platform_tools/android/bin/android_make - Issue 14652007: Resubmit r8929 with the duplicated change in trunk/platform_tools/android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: platform_tools/android/bin/android_make

Issue 14652007: Resubmit r8929 with the duplicated change in trunk/platform_tools/android (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

3 makeVars=""	3 makeVars=""

4 deviceID=""	4 deviceID=""

5	5

6 while (( "$#" )); do	6 while (( "$#" )); do

7	7

8 if [[ $(echo "$1" \| grep "^-d$") != "" ]];	8 if [[ $(echo "$1" \| grep "^-d$") != "" ]];

9 then	9 then

10 deviceID="$2"	10 deviceID="$2"

(...skipping 15 matching lines...) Expand all Loading...
26 $ANDROID_MAKE_CCACHE --version &> /dev/null	26 $ANDROID_MAKE_CCACHE --version &> /dev/null

27 if [[ "$?" != "0" ]]; then	27 if [[ "$?" != "0" ]]; then

28 echo "Unable to find ccache!"	28 echo "Unable to find ccache!"

29 exit 1	29 exit 1

30 fi	30 fi

31 fi	31 fi

32	32

33 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"	33 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

34	34

35 # hack for x86 support in android_setup.sh	35 # hack for x86 support in android_setup.sh

36 if [ "$deviceID" == "x86" ]	36 if [ "$deviceID" == "x86" ] \|\| [ "$deviceID" == "razr_i" ]

37 then	37 then

38 ANDROID_ARCH="x86"	38 ANDROID_ARCH="x86"

39 fi	39 fi

40	40

41 source $SCRIPT_DIR/android_setup.sh	41 source $SCRIPT_DIR/android_setup.sh

42	42

43 setup_device $deviceID	43 setup_device $deviceID

44 returnVal=$?	44 returnVal=$?

45 if [ $returnVal != 0 ]	45 if [ $returnVal != 0 ]

46 then	46 then

47 exit 1;	47 exit 1;

48 fi	48 fi

49	49

50 # write the out directory into the .android_config file	50 # write the out directory into the .android_config file

51 echo $SKIA_OUT > .android_config	51 echo $SKIA_OUT > .android_config

52	52

53 make $makeVars	53 make $makeVars

54 if [ $? != 0 ]	54 if [ $? != 0 ]

55 then	55 then

56 exit 1;	56 exit 1;

57 fi	57 fi

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »