Chromium Code Reviews| Index: build/android/envsetup_functions.sh |
| diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh |
| index 27996cbff33e48bbcdd79c0f2f30c2fb50f48867..725022494d49d355b59bc0399b68b7834a096dc4 100755 |
| --- a/build/android/envsetup_functions.sh |
| +++ b/build/android/envsetup_functions.sh |
| @@ -88,8 +88,11 @@ common_vars_defines() { |
| # startup after compiling with the order_profiling=1 GYP_DEFINES flag. |
| ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out" |
| - # The following defines will affect ARM code generation of both C/C++ compiler |
| - # and V8 mksnapshot. |
| + # Target architecture to be used. Should be overridden for x86 builds. |
| + local target_ach="arm" |
| + |
| + # The following defines will affect platform-specific code generation of both |
| + # the C/C++ compiler and V8 mksnapshot. |
| case "${TARGET_PRODUCT}" in |
| "passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi") |
| DEFINES+=" target_arch=arm" |
|
michaelbai
2012/08/30 16:38:40
We also need to get ride of the duplicated target_
Peter Beverloo
2012/08/30 20:17:24
It's a nice-to-have, but by no means required. I d
|
| @@ -112,11 +115,15 @@ common_vars_defines() { |
| host_arch=$(uname -m | sed -e \ |
| 's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/') |
| DEFINES+=" host_arch=${host_arch}" |
| + target_arch="ia32" |
| ;; |
| *) |
| echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2 |
| return 1 |
| esac |
| + |
| + DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\ |
| +android-${target_arch}/gdbserver/gdbserver" |
|
michaelbai
2012/08/30 16:38:40
For x86 case,
We need set
target_arch=ia32
andro
Peter Beverloo
2012/08/30 20:17:24
line 118 should read "target_arch="x86"".
|
| } |