diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:03 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:03 -0700 |
| commit | 841b213edf7f53941df00cecaa9e7482db09dc6f (patch) | |
| tree | 0ba8935ba0472069d329351b8bf170444ae99a09 /crypto | |
| parent | d55f58d41a51c94eb4a60a244ba69bb66e404258 (diff) | |
| download | replicant_openssl-841b213edf7f53941df00cecaa9e7482db09dc6f.zip replicant_openssl-841b213edf7f53941df00cecaa9e7482db09dc6f.tar.gz replicant_openssl-841b213edf7f53941df00cecaa9e7482db09dc6f.tar.bz2 | |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ic867a941ef51e408a5dc6d5ef4c8ff9ec3dd7f2f
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Android.mk | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/crypto/Android.mk b/crypto/Android.mk index c86badb..d6ff574 100644 --- a/crypto/Android.mk +++ b/crypto/Android.mk @@ -501,13 +501,7 @@ ifeq ($(TARGET_ARCH),arm) else LOCAL_SRC_FILES += $(non_arm_src_files) endif -ifeq ($(TARGET_SIMULATOR),true) - # Make valgrind happy. - LOCAL_CFLAGS += -DPURIFY - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif +LOCAL_SHARED_LIBRARIES += libdl LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libcrypto_static include $(BUILD_STATIC_LIBRARY) @@ -532,13 +526,7 @@ ifeq ($(TARGET_ARCH),arm) else LOCAL_SRC_FILES += $(non_arm_src_files) endif -ifeq ($(TARGET_SIMULATOR),true) - # Make valgrind happy. - LOCAL_CFLAGS += -DPURIFY - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif +LOCAL_SHARED_LIBRARIES += libdl LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libcrypto include $(BUILD_SHARED_LIBRARY) |