diff options
| -rw-r--r-- | envsetup.sh | 1 | ||||
| -rwxr-xr-x | tools/adbs | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index e3e9d67..c1c3f6c 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -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= @@ -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 = ""; |