Merge "Fix bug in on-device linking." into honeycomb

libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs

@@ -56,7 +56,7 @@ void setGamma(float g) {
 }
 
 //sliao
-uchar3 convert2uchar3(float3 xyz);
+extern uchar3 __attribute__((overloadable)) convert2uchar3(float3 xyz);
 
 void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32_t y) {
     uchar4 *output = (uchar4 *)v_out;

libs/rs/rsScriptC.cpp

@@ -490,7 +490,8 @@ void ScriptCState::runCompiler(Context *rsc,
         if (bccLinkBC(s->mBccScript,
                       resName,
                       NULL /*rs_runtime_lib_bc*/,
-                      0 /*rs_runtime_lib_bc_size*/,
+                      1 /*rs_runtime_lib_bc_size*/
+                        /*"1" means skip buffer here, and let libbcc decide*/,
                       0) != 0) {
             LOGE("bcc: FAILS to link bitcode");
             // Handle Fatal Error