diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-13 00:21:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-13 00:21:35 +0000 |
commit | 781ef7657f47eb4bb2b23ada04fb05819c8b7be5 (patch) | |
tree | 19c0c15092f44c0b3e36bf651497a24aa54ee1df | |
parent | 466299b8c3b5bfdfdcf894462c34424951830a54 (diff) | |
parent | e3af1cc9271f0a99a7f2849b4500b74c6a016010 (diff) | |
download | unwinding-781ef7657f47eb4bb2b23ada04fb05819c8b7be5.tar.gz |
Snap for 11211409 from e3af1cc9271f0a99a7f2849b4500b74c6a016010 to sdk-release
Change-Id: I4560ebcb9214b32e1366080c4f9fe4894d938396
-rw-r--r-- | libunwindstack/Android.bp | 18 | ||||
-rw-r--r-- | libunwindstack/exported.map | 7 | ||||
-rw-r--r-- | libunwindstack/exported_x86.map | 8 | ||||
-rw-r--r-- | libunwindstack/include/unwindstack/RegsGetLocal.h | 2 |
4 files changed, 35 insertions, 0 deletions
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp index d2b02c6..da51339 100644 --- a/libunwindstack/Android.bp +++ b/libunwindstack/Android.bp @@ -202,6 +202,24 @@ cc_library { }, }, + arch: { + arm: { + version_script: "exported.map", + }, + arm64: { + version_script: "exported.map", + }, + riscv64: { + version_script: "exported.map", + }, + x86: { + version_script: "exported_x86.map", + }, + x86_64: { + version_script: "exported_x86.map", + }, + }, + apex_available: [ "//apex_available:platform", "com.android.art", diff --git a/libunwindstack/exported.map b/libunwindstack/exported.map new file mode 100644 index 0000000..bfd236c --- /dev/null +++ b/libunwindstack/exported.map @@ -0,0 +1,7 @@ +LIBUNWINDSTACK { + global: + *unwindstack*; + + local: + *; +}; diff --git a/libunwindstack/exported_x86.map b/libunwindstack/exported_x86.map new file mode 100644 index 0000000..d55b3c7 --- /dev/null +++ b/libunwindstack/exported_x86.map @@ -0,0 +1,8 @@ +LIBUNWINDSTACK { + global: + *unwindstack*; + AsmGetRegs; + + local: + *; +}; diff --git a/libunwindstack/include/unwindstack/RegsGetLocal.h b/libunwindstack/include/unwindstack/RegsGetLocal.h index 4cdab9a..a04ea7b 100644 --- a/libunwindstack/include/unwindstack/RegsGetLocal.h +++ b/libunwindstack/include/unwindstack/RegsGetLocal.h @@ -129,6 +129,8 @@ inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { #elif defined(__i386__) || defined(__x86_64__) +// Do not change this, some libraries depend on this function existing on +// these architectures. extern "C" void AsmGetRegs(void* regs); #endif |