summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk6
-rw-r--r--rsScriptC.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index c2e58b66..d0cbbbde 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,9 +27,13 @@ include $(CLEAR_VARS)
input_data_file := $(LOCAL_PATH)/rslib.bc
slangdata_output_var_name := rs_runtime_lib_bc
LOCAL_MODULE := librslib_rt
+
+LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
LOCAL_MODULE_TAGS := optional
include frameworks/compile/slang/SlangData.mk
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
# Build render script lib ====================
diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 5dd976a8..55ee9ca0 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -428,7 +428,7 @@ void ScriptCState::runCompiler(Context *rsc,
// Handle Fatal Error
}
-#if 0
+#if 1
if (bccLinkBC(s->mBccScript,
rs_runtime_lib_bc,
rs_runtime_lib_bc_size) != 0) {