Merge "On-device linking." into honeycomb

libs/rs/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 ====================
 

libs/rs/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) {