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 | 4 |
5 # remove the existing .android_config file prior to running android_setup. If | 5 # remove the existing .android_config file prior to running android_setup. If |
6 # we did not remove this here then we would build for whatever device type was | 6 # we did not remove this here then we would build for whatever device type was |
7 # listed in the .android_config instead of the default device type. | 7 # listed in the .android_config instead of the default device type. |
8 if [ -f .android_config ] | 8 if [ -f .android_config ] |
9 then | 9 then |
10 rm .android_config | 10 rm .android_config |
(...skipping 21 matching lines...) Expand all Loading... |
32 done | 32 done |
33 | 33 |
34 if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then | 34 if [[ -n "$ANDROID_MAKE_CCACHE" ]]; then |
35 $ANDROID_MAKE_CCACHE --version &> /dev/null | 35 $ANDROID_MAKE_CCACHE --version &> /dev/null |
36 if [[ "$?" != "0" ]]; then | 36 if [[ "$?" != "0" ]]; then |
37 echo "Unable to find ccache!" | 37 echo "Unable to find ccache!" |
38 exit 1 | 38 exit 1 |
39 fi | 39 fi |
40 fi | 40 fi |
41 | 41 |
| 42 # Use the "android" flavor of the Makefile generator for both Linux and OS X. |
| 43 exportVar GYP_GENERATORS "make-android" |
42 make ${makeVars[@]} | 44 make ${makeVars[@]} |
43 if [ $? != 0 ] | 45 if [ $? != 0 ] |
44 then | 46 then |
45 exit 1; | 47 exit 1; |
46 fi | 48 fi |
OLD | NEW |