Attempt to create libRSDriver as shared library.
Change-Id: I047b32325efe2fa471b73c48fa7296beecc0c47d
diff --git a/Android.mk b/Android.mk
index 5676462..2d4f580 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,8 +39,9 @@
driver/rsdIntrinsics_Convolve.S
endif
+LOCAL_SHARED_LIBRARIES += libRS
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2
-LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libgui libsync
+LOCAL_SHARED_LIBRARIES += libbcc libbcinfo libui libgui libsync
LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
@@ -49,7 +50,7 @@
LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE_TAGS := optional
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
# Build rsg-generator ====================
include $(CLEAR_VARS)
@@ -79,6 +80,9 @@
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
intermediates:= $(local-intermediates-dir)
+# We depend directly on doing dlopen(libRSDriver.so).
+LOCAL_REQUIRED_MODULES := libRSDriver
+
# Generate custom headers
GEN := $(addprefix $(intermediates)/, \
@@ -150,9 +154,9 @@
rsType.cpp
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2 libbcc
-LOCAL_SHARED_LIBRARIES += libui libbcinfo libgui libsync
+LOCAL_SHARED_LIBRARIES += libui libbcinfo libgui libsync libdl
-LOCAL_STATIC_LIBRARIES := libft2 libRSDriver
+LOCAL_STATIC_LIBRARIES := libft2
LOCAL_C_INCLUDES += external/freetype/include
LOCAL_C_INCLUDES += frameworks/compile/libbcc/include