Merge "libsigchain: intercept bsd_signal on lp32"

am: 1c59b4b4e8

Change-Id: Ib0b9789d7a75928f7433557936b9fac81c53b049

diff --cc services/surfaceflinger/Android.mk
index fb6307e,87ff355..ce858d2
--- 1/services/surfaceflinger/Android.mk
--- 2/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@@ -138,9 -118,10 +138,10 @@@ include $(CLEAR_VARS
  
  LOCAL_CLANG := true
  
- 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_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
 -LOCAL_CPPFLAGS := -std=c++11
 +LOCAL_CPPFLAGS := -std=c++14
  
  LOCAL_INIT_RC := surfaceflinger.rc