Link statically against libslang.
Change-Id: Ief59d0770eca509d7ad069f66e1333a4d15f6057
diff --git a/Android.mk b/Android.mk
index 8094b50..84ee4bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
#
LOCAL_PATH := $(call my-dir)
-# Shared library libslang for host
+# Static library libslang for host
# ========================================================
include $(CLEAR_VARS)
include $(CLEAR_TBLGEN_VARS)
@@ -28,8 +28,6 @@
LOCAL_MODULE := libslang
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
LOCAL_CFLAGS += -Wno-sign-promo
TBLGEN_TABLES := \
@@ -48,7 +46,7 @@
slang_pragma_recorder.cpp \
slang_diagnostic_buffer.cpp
-LOCAL_STATIC_LIBRARIES := \
+LOCAL_WHOLE_STATIC_LIBRARIES := \
libLLVMLinker \
libLLVMipo \
libLLVMBitWriter \
@@ -88,7 +86,7 @@
include $(CLANG_HOST_BUILD_MK)
include $(CLANG_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_SHARED_LIBRARY)
+include $(BUILD_HOST_STATIC_LIBRARY)
# Host static library containing rslib.bc
# ========================================================
@@ -119,11 +117,8 @@
LOCAL_SRC_FILES := \
llvm-rs-link.cpp
-LOCAL_SHARED_LIBRARIES := \
- libslang
-
LOCAL_STATIC_LIBRARIES := \
- librslib
+ librslib libslang
LOCAL_LDLIBS := -ldl -lpthread
@@ -193,11 +188,10 @@
slang_rs_reflect_utils.cpp \
slang_rs_metadata_spec_encoder.cpp
-LOCAL_SHARED_LIBRARIES := \
- libslang
-
LOCAL_STATIC_LIBRARIES := \
- libclangDriver
+ libclangDriver libslang
+
+LOCAL_LDLIBS := -ldl -lpthread
# For build RSCCOptions.inc from RSCCOptions.td
intermediates := $(call local-intermediates-dir)