aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2014-07-24 20:01:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-24 20:01:01 +0000
commit578c6311548e3f85e6b8c8800a66eb252e6b42f7 (patch)
treeb6355001baea63583535baefe1a2cfddba63540f
parent456cc9967831337c759ae2ba9c6a5621ef776110 (diff)
parent5a289ed29345e545742bc33728d7010b5e2c1e65 (diff)
downloadlatinime-578c6311548e3f85e6b8c8800a66eb252e6b42f7.tar.gz
latinime-578c6311548e3f85e6b8c8800a66eb252e6b42f7.tar.xz
latinime-578c6311548e3f85e6b8c8800a66eb252e6b42f7.zip
am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
* commit '5a289ed29345e545742bc33728d7010b5e2c1e65': Revert "Revert "Revert "Use mclinker"""
-rw-r--r--native/jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 8be4d78b6..3a2073f03 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -90,7 +90,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := c++_static
-LOCAL_LDFLAGS += -ldl -fuse-ld=mcld
+LOCAL_LDFLAGS += -ldl
include $(BUILD_SHARED_LIBRARY)
#################### Clean up the tmp vars