p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Export TARGET_GCC_VERSION as an env variable. 

Have it referenced by the adbs tool to pick the specified toolchain.

Change-Id: I23df88946254a55d0749d6753e54559faf33e121
This commit is contained in:
Ben Cheng 2012-12-10 16:04:39 -08:00
parent f8b804f8c5
commit 1526670628
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
envsetup.sh
View File

@ -118,6 +118,7 @@ function setpaths()
# defined in core/config.mk
targetgccversion=$(get_build_var TARGET_GCC_VERSION)
export TARGET_GCC_VERSION=$targetgccversion
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
export ANDROID_EABI_TOOLCHAIN=

6
tools/adbs
View File

@ -140,13 +140,15 @@ def SetupToolsPath():
uname = "darwin-x86"
elif uname == "Linux":
uname = "linux-x86"
prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-4.6/bin/"
gcc_version = os.environ["TARGET_GCC_VERSION"]
prefix = "./prebuilts/gcc/" + uname + "/arm/arm-linux-androideabi-" + \
gcc_version + "/bin/"
addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"
if (not os.path.exists(addr2line_cmd)):
try:
prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilts/gcc/" + \
uname + "/arm/arm-linux-androideabi-4.6/bin/"
uname + "/arm/arm-linux-androideabi-" + gcc_version + "/bin/"
except:
prefix = "";