diff --git a/.efrocachemap b/.efrocachemap index fbd821e4..40a6344f 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4135,16 +4135,16 @@ "assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f", "assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338", "assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/83/b0/c0963abb0e6f5628742e1de7b890", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6a/63/fe355b556462b609f26cebc4a140", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/68/0a/de33d78be9b5f7a31af4f5181d43", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4c/4e/a08641d6e81bbca74c24bf364f59", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f7/b1/8648ef7e0060d0b1b3716893d389", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/41/b5/a5233e4efdf0420f43759e2c9f8e", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f6/62/ac74aa6cb053cdd0486826d580f1", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/f0/21/817d17de9b85320710e57b3e8882", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/52/d6/2ba38ece384d512820ef64c8e748", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/06/44/6daa364334ae5f7ac23ad565cd79", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b1/28/6ceb93f662ea36958b573ea6e761", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b4/34/81b1bb50eece76cfa2163a9fdcba" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/21/b9/84344d916a526f3144eda007f245", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3e/c1/8d69797934e136feb17a400fcf8d", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/06/98/94acb9d29ca85a01edf3ba935e99", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/e5/317de6a4ea73cb9c4fe895a5ed66", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/75/35/61423ae280cfab87ee73bf7e1c34", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2b/ab/08821599d02ec46e83814dcfbab3", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/de/77af3bf69b95e04d7a49d7d606a9", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/43/f8/7bafd47112eb99ede6c817f12704", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/41/ee/0dbd6c907c45ed6c27e26657fe5a", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/cf/ac/4b84bdeaa0dfe5f9b2990c8094b6", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/fc/bd/52a82497581428fc1fe6cb1f7db1", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9d/6c/714e999d02c4ea913159d62692c0" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a613136..86f79f5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ +### 1.5.13 (20095) +- Hopefully fixed an elusive random crash on android that popped up recently. +- Misc bug fixes. + ### 1.5.12 (20087) +- Improved exception handling and crash reporting. +- Misc bug fixes. ### 1.5.11 (20083) - Fixed a freeze in the local network browser. diff --git a/tools/batools/android.py b/tools/batools/android.py index 8fe178d9..08396d90 100644 --- a/tools/batools/android.py +++ b/tools/batools/android.py @@ -74,9 +74,13 @@ def androidaddr(archive_dir: str, arch: str, addr: str) -> None: ['find', os.path.join(ndkpath, 'toolchains'), '-name', '*addr2line']).decode().strip().splitlines() - lines = [line for line in lines if archs[arch]['prefix'] in line] + # print('RAW LINES', lines) + lines = [ + line for line in lines + if archs[arch]['prefix'] in line and '/llvm/' in line + ] if len(lines) != 1: - print("ERROR: couldn't find addr2line binary") + print(f"ERROR: can't find addr2line binary ({len(lines)} options).") sys.exit(255) addr2line = lines[0] efrotools.run('mkdir -p "' + os.path.join(rootdir, 'android_addr_tmp') +