LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 3f5337f9: am 1b0d9bf1: am 8b1c1b30: Merge "Updating stack_core.py to recognize new ABI output from debuggerd."

Browse Source 
* commit '3f5337f9e6b5c3ec3442d7b6c0e839264084f62f':
  Updating stack_core.py to recognize new ABI output from debuggerd.
This commit is contained in:
Elliott Hughes
2014-06-14 01:17:37 +00:00
committed by Android Git Automerger
parent 65681c0c81 3f5337f9e6
commit c3512210a5
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/symbol.py
View File

@@ -78,20 +78,21 @@ def FindToolchain():
if TOOLCHAIN_INFO is not None:
return TOOLCHAIN_INFO
# TODO: TARGET_GCC_VERSION is the version for the primary architecture.
gcc_version = os.environ["TARGET_GCC_VERSION"]
## Known toolchains, newer ones in the front.
if ARCH == "arm64":
gcc_version = os.environ["TARGET_GCC_VERSION"]
known_toolchains = [
("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
]
elif ARCH == "arm":
gcc_version = os.environ["TARGET_GCC_VERSION"]
if ARCH == "arm":
known_toolchains = [
("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"),
]
elif ARCH =="x86":
elif ARCH == "arm64":
known_toolchains = [
("i686-android-linux-4.4.3", "x86", "i686-android-linux")
("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
]
elif ARCH =="x86" or ARCH == "x86_64":
known_toolchains = [
("i686-android-linux" + gcc_version, "x86", "i686-android-linux")
]
elif ARCH == "mips":
gcc_version = os.environ["TARGET_GCC_VERSION"]
@@ -106,10 +107,10 @@ def FindToolchain():
toolchain_info = (label, platform, target);
if os.path.exists(ToolPath("addr2line", toolchain_info)):
TOOLCHAIN_INFO = toolchain_info
print "Using toolchain from :" + ToolPath("", TOOLCHAIN_INFO)
print "Using toolchain from: " + ToolPath("", TOOLCHAIN_INFO)
return toolchain_info
raise Exception("Could not find tool chain")
raise Exception("Could not find tool chain for (%s, %s, %s)" % (label, platform, target))
def SymbolInformation(lib, addr):
"""Look up symbol information about an address.