platform_tools/android/bin/android_make - Issue 22617002: Update Skia Android tools.

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 22617002: Update Skia Android tools. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: more fixes to make the bots happy Created 7 years, 4 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:

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

2	2

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

4 source $SCRIPT_DIR/android_setup.sh	4 source $SCRIPT_DIR/android_setup.sh

5	5

6 for arg in ${APP_ARGS}	6 for arg in ${APP_ARGS[@]}

7 do	7 do

8 if [[ "${arg}" == "--use-ccache" ]];	8 if [[ "${arg}" == "--use-ccache" ]];

9 then	9 then

10 if [[ -z "$ANDROID_MAKE_CCACHE" ]];	10 if [[ -z "$ANDROID_MAKE_CCACHE" ]];

11 then	11 then

12 ANDROID_MAKE_CCACHE=$(which ccache)	12 ANDROID_MAKE_CCACHE=$(which ccache)

13 fi	13 fi

14 else	14 else

15 makeVars=("${makeVars[@]}" "${arg}")	15 makeVars=("${makeVars[@]}" "${arg}")

16 fi	16 fi

(...skipping 10 matching lines...) Expand all Loading...
27 fi	27 fi

28	28

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

30 echo $SKIA_OUT > .android_config	30 echo $SKIA_OUT > .android_config

31	31

32 make ${makeVars[@]}	32 make ${makeVars[@]}

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

34 then	34 then

35 exit 1;	35 exit 1;

36 fi	36 fi

OLD	NEW