summaryrefslogtreecommitdiff
path: root/cmds/app_process
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2016-08-01 14:12:38 -0700
committerDimitry Ivanov <dimitry@google.com>2016-08-01 14:19:26 -0700
commit4c5281862f750cbc9d7355a07ef1a5545b9b3523 (patch)
tree78a00668509c3dc04760de948a3d977d93895d29 /cmds/app_process
parent3e151273a39bf006140226490a2d9fe1fada5f65 (diff)
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
Diffstat (limited to 'cmds/app_process')
-rw-r--r--cmds/app_process/Android.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index fae0400a1212..e530184b9c6a 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