Make arm-linux-androideabi toolchain the default for Android build.
androideabi target is already in upstream GCC. The arm-linux- androideabi toolchain can be built directly from upstream GCC. Switching from old special tailored arm-eabi toolchain to the new arm-linux-androideabi toolchain make us closer to the opensource community and friendly to all toolchain developers. kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain path to PATH. The arm-linux-androideabi-4.4.x toolchain is built with the same source as the latest arm-eabi-4.4.3 toolchain except for the target change patches. Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
This commit is contained in:
12
tools/adbs
12
tools/adbs
@@ -144,23 +144,23 @@ def SetupToolsPath():
|
||||
uname = "darwin-ppc"
|
||||
elif uname == "Linux":
|
||||
uname = "linux-x86"
|
||||
prefix = "./prebuilt/" + uname + "/toolchain/arm-eabi-4.4.3/bin/"
|
||||
addr2line_cmd = prefix + "arm-eabi-addr2line"
|
||||
prefix = "./prebuilt/" + uname + "/toolchain/arm-linux-androideabi-4.4.x/bin/"
|
||||
addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"
|
||||
|
||||
if (not os.path.exists(addr2line_cmd)):
|
||||
try:
|
||||
prefix = os.environ['ANDROID_BUILD_TOP'] + "/prebuilt/" + uname + \
|
||||
"/toolchain/arm-eabi-4.4.3/bin/"
|
||||
"/toolchain/arm-linux-androideabi-4.4.x/bin/"
|
||||
except:
|
||||
prefix = "";
|
||||
|
||||
addr2line_cmd = prefix + "arm-eabi-addr2line"
|
||||
addr2line_cmd = prefix + "arm-linux-androideabi-addr2line"
|
||||
if (not os.path.exists(addr2line_cmd)):
|
||||
print addr2line_cmd + " not found!"
|
||||
sys.exit(1)
|
||||
|
||||
objdump_cmd = prefix + "arm-eabi-objdump"
|
||||
cppfilt_cmd = prefix + "arm-eabi-c++filt"
|
||||
objdump_cmd = prefix + "arm-linux-androideabi-objdump"
|
||||
cppfilt_cmd = prefix + "arm-linux-androideabi-c++filt"
|
||||
|
||||
###############################################################################
|
||||
# look up the function and file/line number for a raw stack trace line
|
||||
|
Reference in New Issue
Block a user