platform_tools/android/bin/android_make - Issue 25535002: Fix ninja build on 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 25535002: Fix ninja build on Android (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 2 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

« no previous file with comments | « gyp_skia ('k') | no next file » | no next file with comments »

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

2	2

3 # Fail-fast if anything in the script fails.	3 # Fail-fast if anything in the script fails.

4 set -e	4 set -e

5	5

6 # Remove any existing .android_config file before running android_setup. If we	6 # Remove any existing .android_config file before running android_setup. If we

7 # did not remove this now then we would build for whatever device type was	7 # did not remove this now then we would build for whatever device type was

8 # listed in the .android_config instead of the default device type.	8 # listed in the .android_config instead of the default device type.

9 rm -f .android_config	9 rm -f .android_config

10	10

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

12 source $SCRIPT_DIR/android_setup.sh	12 source $SCRIPT_DIR/android_setup.sh

13	13

14 if [ $(basename $0) = "android_make" ]; then	14 if [ $(basename $0) = "android_make" ]; then

15 GYP_GENERATORS=make-android make ${APP_ARGS[@]}	15 GYP_GENERATORS=make-android make ${APP_ARGS[@]}

16 else	16 else

17 GYP_GENERATORS=ninja ./gyp_skia	17 GYP_GENERATORS=ninja-android ./gyp_skia

18 OUT=$SKIA_OUT/${BUILDTYPE-Debug} # Defaults to Debug if BUILDTYPE isn't se t.	18 OUT=$SKIA_OUT/${BUILDTYPE-Debug} # Defaults to Debug if BUILDTYPE isn't se t.

19 ninja -C $OUT ${APP_ARGS[@]}	19 ninja -C $OUT ${APP_ARGS[@]}

20 ln -sf lib $OUT/lib.target # android_run_skia looks in lib.target; n inja writes to lib.	20 ln -sf lib $OUT/lib.target # android_run_skia looks in lib.target; n inja writes to lib.

21 fi	21 fi

22	22

23 # Write the device id into the .android_config file. This tells	23 # Write the device id into the .android_config file. This tells

24 # android_run_skia the last build we completed.	24 # android_run_skia the last build we completed.

25 echo $DEVICE_ID > .android_config	25 echo $DEVICE_ID > .android_config

26	26

OLD	NEW