Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'am-30c74bed2a9e451c873965b4647a2dc3' into nyc-mr1-dev-plus-aosp

Browse Source 
* changes:
  Merge "Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff" into nyc-dev-plus-aosp am: 1e35cb6025
  Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff am: c58ea7d777
This commit is contained in:
Android Build Merger (Role)
2016-08-01 23:11:49 +00:00
committed by Android (Google) Code Review
parent 0e412641d9 ec95f83ac8
commit 7fa988a7bf
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/app_process/Android.mk
View File

@@ -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