commit 12f2606f1affdf9fac72b7c46a3aac4fbec606a4
author Shih-wei Liao <sliao@google.com> Thu Jan 13 02:04:00 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 13 02:04:00 2011 -0800
tree 9b782f64ec064386504dc8c3355ae41f816e6d5d
parent 4a21ed98412fb87d5f386a256df83c56ca9cf83d
parent 60c3234efa02e0fa51f550271d5be02d06fc6a4a

Merge "On-device linking." into honeycomb

Android.mk

diff --git a/Android.mk b/Android.mk
index c2e58b6..d0cbbbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,9 +27,13 @@
 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 ====================
 

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 5dd976a..55ee9ca 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -428,7 +428,7 @@
             // Handle Fatal Error
         }
 
-#if 0
+#if 1
         if (bccLinkBC(s->mBccScript,
                       rs_runtime_lib_bc,
                       rs_runtime_lib_bc_size) != 0) {