From 4c5281862f750cbc9d7355a07ef1a5545b9b3523 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Mon, 1 Aug 2016 14:12:38 -0700 Subject: [PATCH] libsigchain: intercept bsd_signal on lp32 bsd_signal is a deprecated synonym for the signal. Nevertheless there are apps and libraries calling this function. libsigchain needs to intercept these calls and handle them the same way it handles signal() call. Bug: http://b/30562229 Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported readelf --dyn-sym app_process64 and check that bsd_signal is not exported Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858 --- cmds/app_process/Android.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index fae0400a12129..e530184b9c6a8 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -12,7 +12,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ app_main.cpp -LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic +LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic +LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic LOCAL_SHARED_LIBRARIES := \ libdl \ @@ -58,7 +59,9 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain -LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic +LOCAL_LDFLAGS := -ldl +LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic +LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic LOCAL_CPPFLAGS := -std=c++11 LOCAL_MODULE := app_process__asan