From 747d30ebf368be8c4ec0455324bdac53204eb179 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 20 Oct 2015 14:06:25 -0400 Subject: [PATCH] dlfcn: update ifdef around old_name_ Commit 9185e04f72c16d2a66d92ac89b38ee926d7f706b changed the ifdef around old_name_ from __arm__ to __work_around_b_###__, but missed one place in dlfcn.cpp. So if you do a build w/out that workaround for arm, you end up with a build failure: bionic/linker/dlfcn.cpp:275:27: error: no member named 'old_name_' in 'soinfo' strlcpy(__libdl_info->old_name_, __libdl_info->soname_, sizeof(__libdl_info->old_name_)); ~~~~~~~~~~~~ ^ bionic/linker/dlfcn.cpp:275:82: error: no member named 'old_name_' in 'soinfo' strlcpy(__libdl_info->old_name_, __libdl_info->soname_, sizeof(__libdl_info->old_name_)); ~~~~~~~~~~~~ ^ Bug: 24425865 Change-Id: Idbe1cc1c28083afeee6d90203c221f30f661c69c --- linker/dlfcn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp index f1b26c9e1..93189df85 100644 --- a/linker/dlfcn.cpp +++ b/linker/dlfcn.cpp @@ -271,7 +271,7 @@ soinfo* get_libdl_info() { __libdl_info->local_group_root_ = __libdl_info; __libdl_info->soname_ = "libdl.so"; __libdl_info->target_sdk_version_ = __ANDROID_API__; -#if defined(__arm__) +#if defined(__work_around_b_24465209__) strlcpy(__libdl_info->old_name_, __libdl_info->soname_, sizeof(__libdl_info->old_name_)); #endif }