commit 0467d9a53b20f8c9069019cde9f035c127acbc9a
author Shih-wei Liao <sliao@google.com> Wed Apr 25 04:06:52 2012 -0700
committer Shih-wei Liao <sliao@google.com> Wed Apr 25 04:06:52 2012 -0700
tree cb84878c984d7f69d8d008da6ee1c8441f54dc7a
parent a7b5a26a5487851706ddd6c33c1bb88137333df4

Link libclcore.bc for RenderScript by default.

Change-Id: I93eb5a09689373afa973b8c08dd0842152220217

lib/RenderScript/RSInfo.cpp

diff --git a/lib/RenderScript/RSInfo.cpp b/lib/RenderScript/RSInfo.cpp
index f3010cf..6f1b309 100644
--- a/lib/RenderScript/RSInfo.cpp
+++ b/lib/RenderScript/RSInfo.cpp
@@ -29,8 +29,11 @@
 
 const char RSInfo::LibBCCPath[] = "/system/lib/libbcc.so";
 const char RSInfo::LibRSPath[] = "/system/lib/libRS.so";
+const char RSInfo::LibCLCorePath[] = "/system/lib/libclcore.bc";
+
 const uint8_t *RSInfo::LibBCCSHA1 = NULL;
 const uint8_t *RSInfo::LibRSSHA1 = NULL;
+const uint8_t *RSInfo::LibCLCoreSHA1 = NULL;
 
 void RSInfo::LoadBuiltInSHA1Information() {
   if (LibBCCSHA1 != NULL) {
@@ -47,6 +50,8 @@
 
   LibBCCSHA1 = reinterpret_cast<const uint8_t *>(::dlsym(h, "libbcc_so_SHA1"));
   LibRSSHA1 = reinterpret_cast<const uint8_t *>(::dlsym(h, "libRS_so_SHA1"));
+  LibCLCoreSHA1 =
+      reinterpret_cast<const uint8_t *>(::dlsym(h, "libclcore_bc_SHA1"));
 
   return;
 }
@@ -69,8 +74,8 @@
 bool RSInfo::CheckDependency(const RSInfo &pInfo,
                              const char *pInputFilename,
                              const RSScript::SourceDependencyListTy &pDeps) {
-  // Built-in dependencies are libbcc.so and libRS.so.
-  static const unsigned NumBuiltInDependencies = 2;
+  // Built-in dependencies are libbcc.so, libRS.so and libclcore.bc.
+  static const unsigned NumBuiltInDependencies = 3;
 
   LoadBuiltInSHA1Information();
 
@@ -85,6 +90,8 @@
         pInfo.mDependencyTable[0];
     const std::pair<const char *, const uint8_t *> &cache_libRS_dep =
         pInfo.mDependencyTable[1];
+    const std::pair<const char *, const uint8_t *> &cache_libclcore_dep =
+        pInfo.mDependencyTable[2];
 
     // Check libbcc.so.
     if (::memcmp(cache_libbcc_dep.second, LibBCCSHA1, SHA1_DIGEST_LENGTH) != 0) {
@@ -106,6 +113,17 @@
         return false;
     }
 
+    // Check libclcore.bc.
+    if (::memcmp(cache_libclcore_dep.second, LibCLCoreSHA1,
+                 SHA1_DIGEST_LENGTH) != 0) {
+        ALOGD("Cache %s is dirty due to %s has been updated.", pInputFilename,
+              LibRSPath);
+        PRINT_DEPENDENCY("current - ", LibCLCorePath, LibCLCoreSHA1);
+        PRINT_DEPENDENCY("cache - ", cache_libclcore_dep.first,
+                                     cache_libclcore_dep.second);
+        return false;
+    }
+
     for (unsigned i = 0; i < pDeps.size(); i++) {
       const RSScript::SourceDependency &in_dep = *(pDeps[i]);
       const std::pair<const char *, const uint8_t *> &cache_dep =