diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-07 13:43:23 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-07 16:52:46 -0700 |
| commit | f57874dddefc03fef9ad36fbdd87e39a08a8d641 (patch) | |
| tree | 4cb51f492558475368ce0df190c12e8f1adf732a /dalvikvm | |
| parent | 1000e69b7e11348f2e1d3ba67339616a647f53d7 (diff) | |
| download | art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.zip art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.tar.gz art-f57874dddefc03fef9ad36fbdd87e39a08a8d641.tar.bz2 | |
Remove libsigchain from LD_PRELOADS
Link sigchain.cc statically with dalvikvm, app_process,
surfaceflinger, dex2oat, patchoat and objdump.
Replace libsigchain.so with dummy implementaions to avoid
situations when it is used incorrectly.
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index a06b5c5..b7e649a 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -24,10 +24,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := cc -LOCAL_SRC_FILES := dalvikvm.cc +LOCAL_SRC_FILES := dalvikvm.cc ../sigchainlib/sigchain.cc LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_C_INCLUDES := art/runtime -LOCAL_SHARED_LIBRARIES := libdl libnativehelper +LOCAL_SHARED_LIBRARIES := libdl liblog libnativehelper +LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_MULTILIB := both @@ -50,11 +51,11 @@ LOCAL_MODULE := dalvikvm LOCAL_MODULE_TAGS := optional LOCAL_CLANG := true LOCAL_CPP_EXTENSION := cc -LOCAL_SRC_FILES := dalvikvm.cc +LOCAL_SRC_FILES := dalvikvm.cc ../sigchainlib/sigchain.cc LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libnativehelper -LOCAL_LDFLAGS := -ldl -lpthread +LOCAL_LDFLAGS := -ldl -lpthread -Wl,--export-dynamic LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_IS_HOST_MODULE := true |