summaryrefslogtreecommitdiffstats
path: root/libunwindstack/Android.bp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2018-01-12 15:53:19 -0800
committerChristopher Ferris <cferris@google.com>2018-01-16 14:59:51 -0800
commited37aca9876de87b86f50126da1541ae2699e74f (patch)
treeb353718d19d99a2b521c1bc500b0338d1bbab77a /libunwindstack/Android.bp
parent85d0c3adaf2a6d63e99681718a5d79cf012644ca (diff)
downloadcore-ed37aca9876de87b86f50126da1541ae2699e74f.tar.gz
core-ed37aca9876de87b86f50126da1541ae2699e74f.tar.bz2
core-ed37aca9876de87b86f50126da1541ae2699e74f.zip
Find first non-zero jit debug entry.
Sometimes a process will have multiple shared libraries loaded that have defined __jit_debug_descriptor. Specifically, art testing will load libart.so and libartd.so, which would have broken unwinding through jit'd code for art testing if libart.so winds up being found first. In order to avoid duplicating the code for the linker to figure out which one is live, change the algorithm to find the first non-zero first_entry_ set in __jit_debug_descriptor. Bug: 68396769 Test: Passes unit tests. Test: Verified this can unwind 137-cfi on arm/arm64. Change-Id: Ic4d403065d2c6f22476ef0171e7add17cd1464cd
Diffstat (limited to 'libunwindstack/Android.bp')
-rw-r--r--libunwindstack/Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 484bc7d55..9389b407c 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -170,6 +170,7 @@ cc_test {
data: [
"tests/files/elf32.xz",
"tests/files/elf64.xz",
+ "tests/files/offline/jit_debug_arm32/*",
"tests/files/offline/jit_debug_x86_32/*",
"tests/files/offline/gnu_debugdata_arm32/*",
"tests/files/offline/straddle_arm32/*",