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

Make the stack script python3.5 compatible.

Browse Source 
Ensure that the script works on buildbots.

Test: adb shell debuggerd -b <pid> | development/scripts/stack
Change-Id: I3fd4a0ed78ff3245d1ab2f6e842446888c5c7b8b
This commit is contained in:
David Srbecky
2021-04-27 22:24:36 +01:00
parent d69af024bc
commit fd1e41623d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/symbol.py
View File

@@ -36,7 +36,7 @@ def FindSymbolsDir():
stream = None stream = None
try: try:
cmd = "build/soong/soong_ui.bash --dumpvar-mode --abs TARGET_OUT_UNSTRIPPED" cmd = "build/soong/soong_ui.bash --dumpvar-mode --abs TARGET_OUT_UNSTRIPPED"
stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, encoding='utf8', shell=True).stdout stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True, shell=True).stdout
return str(stream.read().strip()) return str(stream.read().strip())
finally: finally:
if stream is not None: if stream is not None:
@@ -91,7 +91,7 @@ class ProcessCache:
return pipe return pipe
def SpawnProcess(self, cmd): def SpawnProcess(self, cmd):
return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, encoding='utf8') return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
def TerminateProcess(self, pipe): def TerminateProcess(self, pipe):
pipe.stdin.close() pipe.stdin.close()
@@ -390,7 +390,7 @@ def CallObjdumpForSet(lib, unique_addrs):
current_symbol_addr = 0 # The address of the current function. current_symbol_addr = 0 # The address of the current function.
addr_index = 0 # The address that we are currently looking for. addr_index = 0 # The address that we are currently looking for.
stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, encoding='utf8').stdout stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True).stdout
for line in stream: for line in stream:
# Is it a function line like: # Is it a function line like:
# 000177b0 <android::IBinder::~IBinder()>: # 000177b0 <android::IBinder::~IBinder()>: