Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1442)

Unified Diff: build/android/envsetup_functions.sh

Issue 10823435: Fix the gdb path for NDK-r8b. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more paths for gdbserver Created 8 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:
View side-by-side diff with in-line comments
Download patch
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index e7ed8f27f97b2c5cb6264088cbbf83c74be72e93..7597c3aad7c171f99e8578ca0727cda1634d7cf6 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -95,15 +95,18 @@ common_vars_defines() {
DEFINES+=" target_arch=arm"
Yaron 2012/08/25 00:14:14 Nit: remove the duplicate "target_arch" assignment
michaelbai 2012/08/29 19:26:52 Done.
DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
DEFINES+=" ${ORDER_DEFINES}"
+ TARGET_ARCH="arm"
;;
"trygon"|"tervigon")
DEFINES+=" target_arch=arm"
DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
DEFINES+=" ${ORDER_DEFINES}"
+ TARGET_ARCH="arm"
;;
"full")
DEFINES+=" target_arch=arm"
DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
+ TARGET_ARCH="arm"
;;
*x86*)
# TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
@@ -112,11 +115,14 @@ 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="x86"
;;
*)
echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2
return 1
esac
+ DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\
+android-${TARGET_ARCH}/gdbserver/gdbserver"
}
« no previous file with comments | « build/android/ant/common.xml ('k') | build/android/gdb_apk » ('j') | build/java.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698