summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-04-16 10:58:40 -0700
committerDan Albert <danalbert@google.com>2014-04-16 10:58:40 -0700
commit226cd95300d2a7efbfa3f62c837d638e92c1f433 (patch)
tree598981d30025c285f3ee5bb52bb910dc2db5c6d3
parent2ef012e47441428f752c6a29d2927513669dda30 (diff)
downloadlibcxx_35a-226cd95300d2a7efbfa3f62c837d638e92c1f433.tar.gz
Fixes libdl link errors on x86 and mips32
Change-Id: I9db444307888f8154b7cd9f992907836a9419684
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 92ecddca..16cf8e94 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,6 +59,11 @@ LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES)
LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS)
LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_SHARED_LIBRARIES := libcxxabi
+
+ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm arm64))
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
+
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)