Skip to content

Commit 6723d3a

Browse files
author
Chris Brody
committed
Workaround bug in NDK gold linker thanks to @lkjh654 (#151) and @guardianproject see: https://code.google.com/p/android/issues/detail?id=109071
1 parent b24d9e1 commit 6723d3a

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

external/Android.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ LOCAL_C_INCLUDES := \
9595
$(LOCAL_PATH)/platform-system-core/include \
9696
$(LOCAL_PATH)/platform-frameworks-base/include
9797

98+
LOCAL_LDFLAGS += -fuse-ld=bfd
9899
LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/
99100
LOCAL_LDLIBS := -llog -lutils -lcutils
100101
LOCAL_MODULE := libsqlcipher_android

jni/Android.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ LOCAL_LDLIBS += -ldl -llog
5757
LOCAL_LDLIBS += -lnativehelper -landroid_runtime -lutils -lbinder
5858
# these are build in the ../external section
5959

60+
LOCAL_LDFLAGS += -fuse-ld=bfd
6061
LOCAL_LDLIBS += -lsqlcipher_android
6162
LOCAL_LDFLAGS += -L../obj/local/$(TARGET_ARCH_ABI)
6263
LOCAL_LDLIBS += -licui18n -licuuc

0 commit comments

Comments
 (0)