From 067e7b261a9fedab9217fc9d4baa76ba577636c2 Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Wed, 12 Jan 2011 19:14:27 -0800
Subject: [PATCH] On-device linking.

Change-Id: I609f575f1c2b9e9c3de0d8c16eb06b66b744bcb5
---
 libs/rs/Android.mk    | 6 +++++-
 libs/rs/rsScriptC.cpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index c2e58b663ae26..d0cbbbde8b1bf 100644
--- a/libs/rs/Android.mk
+++ b/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 ====================
 
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 5dd976a846ffb..55ee9ca0fe55f 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/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) {