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

Merge "Add missing changes from ARCH removal." am: 8f87d99d85

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2485618

Change-Id: I6b88576c8f8858535f2adb3affc6e5112fa086f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris
2023-03-14 00:25:35 +00:00
committed by Automerger Merge Worker
parent e7307617bc 8f87d99d85
commit 03c8951115
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/stack
View File

@@ -44,10 +44,7 @@ def main():
args = parser.parse_args()
if args.arch:
if args.arch == "arm" or args.arch == "x86":
symbol.ARCH_IS_32BIT = True
else:
symbol.ARCH_IS_32BIT = False
symbol.ARCH_IS_32BIT = not "64" in args.arch
if args.symbols_dir:
symbol.SYMBOLS_DIR = args.symbols_dir
if args.symbols_zip:

4
scripts/stack_core.py
View File

@@ -584,10 +584,6 @@ class RegisterPatternTests(unittest.TestCase):
lines = example_crash.split('\n')
symbol.SetBitness(lines)
tc.UpdateBitnessRegexes()
if symbol.ARCH_IS_32BIT:
print("32 Bit Arch")
else:
print("64 Bit Arch")
for line in lines:
tc.ProcessLine(line)
is_register = (re.search(stupid_pattern, line) is not None)

2
scripts/symbol.py
View File

@@ -580,7 +580,7 @@ class FormatSymbolWithoutParametersTests(unittest.TestCase):
def test_nested(self):
self.assertEqual(FormatSymbolWithoutParameters("foo(int i)::bar(int j)"), "foo::bar")
def test_unballanced(self):
def test_unbalanced(self):
self.assertEqual(FormatSymbolWithoutParameters("foo(bar(int i)"), "foo(bar(int i)")
self.assertEqual(FormatSymbolWithoutParameters("foo)bar(int i)"), "foo)bar(int i)")
self.assertEqual(FormatSymbolWithoutParameters("foo<bar(int i)"), "foo<bar(int i)")