commit 5c29a8bc19bfeb271dfb389e3130312aa198500a
author Shih-wei Liao <sliao@google.com> Sun Jan 16 15:41:25 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 16 15:41:25 2011 -0800
tree 93e6d757df52e9770ad65ec2ac9f6342987173f5
parent 058f783e69684aee062840e6d95330eae1b8e9ec
parent b2cfc988101f93ee5e1fbcfc717230dee71aee3b

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

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

diff --git a/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs b/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
index aa4cf2d..4615e1f 100644
--- a/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
+++ b/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs
@@ -56,7 +56,7 @@
 }
 
 //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;

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 0ecb18a..1ab2109 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -490,7 +490,8 @@
         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