platform_tools/android/bin/android_make - Issue 19796008: Update android_make to use arrays instead of space delimited strings

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 19796008: Update android_make to use arrays instead of space delimited strings (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 5 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=""

4 deviceID=""	3 deviceID=""

5	4

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

7	6

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

9 then	8 then

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

11 shift	10 shift

12 elif [[ "$1" == "--use-ccache" ]];	11 elif [[ "$1" == "--use-ccache" ]];

13 then	12 then

14 if [[ -z "$ANDROID_MAKE_CCACHE" ]];	13 if [[ -z "$ANDROID_MAKE_CCACHE" ]];

15 then	14 then

16 ANDROID_MAKE_CCACHE=$(which ccache)	15 ANDROID_MAKE_CCACHE=$(which ccache)

17 fi	16 fi

18 else	17 else

19 makeVars="$makeVars $1"	18 makeVars=("${makeVars[@]}" "$1")

20 fi	19 fi

21	20

22 shift	21 shift

23 done	22 done

24	23

25 if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then	24 if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then

26 $ANDROID_MAKE_CCACHE --version &> /dev/null	25 $ANDROID_MAKE_CCACHE --version &> /dev/null

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

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

29 exit 1	28 exit 1

(...skipping 13 matching lines...) Expand all Loading...
43 setup_device $deviceID	42 setup_device $deviceID

44 returnVal=$?	43 returnVal=$?

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

46 then	45 then

47 exit 1;	46 exit 1;

48 fi	47 fi

49	48

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

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

52	51

53 make $makeVars	52 make ${makeVars[@]}

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

55 then	54 then

56 exit 1;	55 exit 1;

57 fi	56 fi

OLD	NEW

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