Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # Sets up environment for building Chromium on Android. It can either be | 6 # Sets up environment for building Chromium on Android. It can either be |
| 7 # compiled with the Android tree or using the Android SDK/NDK. To build with | 7 # compiled with the Android tree or using the Android SDK/NDK. To build with |
| 8 # NDK/SDK: ". build/android/envsetup.sh". Environment variable | 8 # NDK/SDK: ". build/android/envsetup.sh". Environment variable |
| 9 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to | 9 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to |
| 10 # specifiy build type. | 10 # specifiy build type. |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 fi | 138 fi |
| 139 | 139 |
| 140 # Source a bunch of helper functions | 140 # Source a bunch of helper functions |
| 141 . ${CHROME_SRC}/build/android/adb_device_functions.sh | 141 . ${CHROME_SRC}/build/android/adb_device_functions.sh |
| 142 | 142 |
| 143 ANDROID_GOMA_WRAPPER="" | 143 ANDROID_GOMA_WRAPPER="" |
| 144 if [[ -d $GOMA_DIR ]]; then | 144 if [[ -d $GOMA_DIR ]]; then |
| 145 ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" | 145 ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" |
| 146 num_cores="$(grep --count ^processor /proc/cpuinfo)" | 146 num_cores="$(grep --count ^processor /proc/cpuinfo)" |
| 147 # Goma is IO-ish you want more threads than you have cores. | 147 # Goma is IO-ish you want more threads than you have cores. |
| 148 let "goma_threads=num_cores*2" | 148 let "goma_threads=24" |
|
newt (away)
2013/11/05 15:37:05
remove this :)
keishi
2013/11/06 02:20:42
Done.
| |
| 149 if [ -z "${GOMA_COMPILER_PROXY_THREADS}" -a "${goma_threads}" -gt 16 ]; then | 149 if [ -z "${GOMA_COMPILER_PROXY_THREADS}" -a "${goma_threads}" -gt 16 ]; then |
| 150 # The default is 16 threads, if the machine has many cores we crank it up a bit | 150 # The default is 16 threads, if the machine has many cores we crank it up a bit |
| 151 GOMA_COMPILER_PROXY_THREADS="${goma_threads}" | 151 GOMA_COMPILER_PROXY_THREADS="${goma_threads}" |
| 152 export GOMA_COMPILER_PROXY_THREADS | 152 export GOMA_COMPILER_PROXY_THREADS |
| 153 fi | 153 fi |
| 154 fi | 154 fi |
| 155 export ANDROID_GOMA_WRAPPER | 155 export ANDROID_GOMA_WRAPPER |
| 156 | 156 |
| 157 # Declare Android are cross compile. | 157 # Declare Android are cross compile. |
| 158 export GYP_CROSSCOMPILE=1 | 158 export GYP_CROSSCOMPILE=1 |
| 159 | 159 |
| 160 # Performs a gyp_chromium run to convert gyp->Makefile for android code. | 160 # Performs a gyp_chromium run to convert gyp->Makefile for android code. |
| 161 android_gyp() { | 161 android_gyp() { |
| 162 # This is just a simple wrapper of gyp_chromium, please don't add anything | 162 # This is just a simple wrapper of gyp_chromium, please don't add anything |
| 163 # in this function. | 163 # in this function. |
| 164 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" | 164 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" |
| 165 ( | 165 ( |
| 166 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" | 166 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" |
| 167 ) | 167 ) |
| 168 } | 168 } |
| 169 | 169 |
| 170 # FLOCK needs to be null on system that has no flock | 170 # FLOCK needs to be null on system that has no flock |
| 171 which flock > /dev/null || export FLOCK= | 171 which flock > /dev/null || export FLOCK= |
| OLD | NEW |