diff options
| author | Dan Albert <danalbert@google.com> | 2019-08-21 18:15:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-21 18:15:51 -0700 |
| commit | efa132b51a3219dc1f121fa5609263d249932003 (patch) | |
| tree | 11d0b057c8552351222ffb43b33010fe9433e6f4 | |
| parent | b31a9daa4fcbf807b6bab8a758ea502b4e517445 (diff) | |
| parent | 894c72b8751cc912d0f6f5d7e403ea9cc3b069ba (diff) | |
Merge "Link libc++demangle." am: 74e56438bb am: 7e5db5bfcd am: 41b22147f2
am: 894c72b875
Change-Id: Iaabfeff104ab6d9ce0715ab2cb97a0f2ecf641a3
| -rw-r--r-- | libc/malloc_debug/Android.bp | 6 | ||||
| -rw-r--r-- | linker/Android.bp | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libc/malloc_debug/Android.bp b/libc/malloc_debug/Android.bp index d6b85319e..2bff260d8 100644 --- a/libc/malloc_debug/Android.bp +++ b/libc/malloc_debug/Android.bp @@ -27,6 +27,12 @@ cc_library_static { }, native_coverage: false, + target: { + android: { + static_libs: ["libc++demangle"], + }, + }, + // -Wno-error=format-zero-length needed for gcc to compile. cflags: [ "-Wall", diff --git a/linker/Android.bp b/linker/Android.bp index bdb7c178a..e2cdd1484 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -295,7 +295,10 @@ cc_binary { target: { android: { - static_libs: ["libdebuggerd_handler_fallback"], + static_libs: [ + "libc++demangle", + "libdebuggerd_handler_fallback", + ], }, }, compile_multilib: "both", |