gistfile1.txt

diff --git a/external/Android.mk b/external/Android.mk
index 592d91f..d21ecfc 100644
--- a/external/Android.mk
+++ b/external/Android.mk
@@ -19,7 +19,7 @@ sqlcipher/sqlite3.c:
 copy-libs-hack: build-local-hack
 	install -p -m644 libs/x86_64/*.so ../obj/local/x86_64/
 
-project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/
+project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/ -fuse-ld=bfd
 
 #------------------------------------------------------------------------------#
 # libsqlite3
@@ -94,7 +94,7 @@ LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc static-libcrypto
 LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) \
 		-DOS_PATH_SEPARATOR="'/'" -DHAVE_SYS_UIO_H
 
-LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/
+LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/ -fuse-ld=bfd
 LOCAL_LDLIBS := -llog -lutils -lcutils
 LOCAL_MODULE := libsqlcipher_android
 LOCAL_MODULE_FILENAME := libsqlcipher_android
diff --git a/jni/Android.mk b/jni/Android.mk
index 25109a1..be58dfb 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -59,6 +59,7 @@ LOCAL_LDLIBS += -lnativehelper -landroid_runtime -lutils -lbinder
 
 LOCAL_LDLIBS  += -lsqlcipher_android
 LOCAL_LDFLAGS += -L../obj/local/$(TARGET_ARCH_ABI)
+LOCAL_LDFLAGS += -fuse-ld=bfd
 LOCAL_LDLIBS  += -licui18n -licuuc
 
 ifeq ($(WITH_MALLOC_LEAK_CHECK),true)

diff --git a/project.properties b/project.properties
index 5a70945..bbe203c 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-21