diff options
Diffstat (limited to 'cmds/app_process/Android.mk')
-rw-r--r-- | cmds/app_process/Android.mk | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index 1ca14a6..397a7d1 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -2,15 +2,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -# TODO: Trying to link libsigchain as a static library prevents -# static linker from exporting necessary symbols. So as a workaround -# we use sigchain.o LOCAL_SRC_FILES:= \ - app_main.cpp \ - sigchain_proxy.cpp + app_main.cpp LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic -LOCAL_CPPFLAGS := -std=c++11 -Iart LOCAL_SHARED_LIBRARIES := \ libdl \ @@ -20,6 +15,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_MODULE:= app_process LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := app_process32 @@ -36,10 +33,8 @@ ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) -# see comment above (~l5) LOCAL_SRC_FILES:= \ - app_main.cpp \ - sigchain_proxy.cpp + app_main.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -48,8 +43,10 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libandroid_runtime +LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain + LOCAL_LDFLAGS := -ldl -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic -LOCAL_CPPFLAGS := -std=c++11 -Iart +LOCAL_CPPFLAGS := -std=c++11 LOCAL_MODULE := app_process__asan LOCAL_MODULE_TAGS := eng |