commit f7401ab4b42dcbd782f20ba5c279694edbd28516
author Shih-wei Liao <sliao@google.com> Fri Jan 25 16:29:44 2013 -0800
committer Shih-wei Liao <sliao@google.com> Thu Feb 07 03:37:14 2013 -0800
tree 91aec6378804aa8e9d1a77e3f2c428ebdfe3f939
parent 6297382734716a572100f5a395b3df1b2b98908d

Add libcompiler_rt.so as built-in dependencies for RS.

Change-Id: I376616ffbe26813a8341e87c965a27666d35b9a6

lib/Renderscript/RSInfo.cpp

diff --git a/lib/Renderscript/RSInfo.cpp b/lib/Renderscript/RSInfo.cpp
index ff6a0a2..c2584e8 100644
--- a/lib/Renderscript/RSInfo.cpp
+++ b/lib/Renderscript/RSInfo.cpp
@@ -31,6 +31,7 @@
 using namespace bcc;
 
 const char RSInfo::LibBCCPath[] = "/system/lib/libbcc.so";
+const char RSInfo::LibCompilerRTPath[] = "/system/lib/libcompiler_rt.so";
 const char RSInfo::LibRSPath[] = "/system/lib/libRS.so";
 const char RSInfo::LibCLCorePath[] = "/system/lib/libclcore.bc";
 #if defined(ARCH_ARM_HAVE_NEON)
@@ -38,6 +39,7 @@
 #endif
 
 const uint8_t *RSInfo::LibBCCSHA1 = NULL;
+const uint8_t *RSInfo::LibCompilerRTSHA1 = NULL;
 const uint8_t *RSInfo::LibRSSHA1 = NULL;
 const uint8_t *RSInfo::LibCLCoreSHA1 = NULL;
 #if defined(ARCH_ARM_HAVE_NEON)
@@ -59,6 +61,8 @@
   }
 
   LibBCCSHA1 = reinterpret_cast<const uint8_t *>(::dlsym(h, "libbcc_so_SHA1"));
+  LibCompilerRTSHA1 =
+      reinterpret_cast<const uint8_t *>(::dlsym(h, "libcompiler_rt_so_SHA1"));
   LibRSSHA1 = reinterpret_cast<const uint8_t *>(::dlsym(h, "libRS_so_SHA1"));
   LibCLCoreSHA1 =
       reinterpret_cast<const uint8_t *>(::dlsym(h, "libclcore_bc_SHA1"));
@@ -94,9 +98,9 @@
   // Built-in dependencies are libbcc.so, libRS.so and libclcore.bc plus
   // libclcore_neon.bc if NEON is available on the target device.
 #if !defined(ARCH_ARM_HAVE_NEON)
-  static const unsigned NumBuiltInDependencies = 3;
-#else
   static const unsigned NumBuiltInDependencies = 4;
+#else
+  static const unsigned NumBuiltInDependencies = 5;
 #endif
 
   LoadBuiltInSHA1Information();
@@ -110,13 +114,15 @@
     // Built-in dependencies always go first.
     const std::pair<const char *, const uint8_t *> &cache_libbcc_dep =
         pInfo.mDependencyTable[0];
-    const std::pair<const char *, const uint8_t *> &cache_libRS_dep =
+    const std::pair<const char *, const uint8_t *> &cache_libcompiler_rt_dep =
         pInfo.mDependencyTable[1];
-    const std::pair<const char *, const uint8_t *> &cache_libclcore_dep =
+    const std::pair<const char *, const uint8_t *> &cache_libRS_dep =
         pInfo.mDependencyTable[2];
+    const std::pair<const char *, const uint8_t *> &cache_libclcore_dep =
+        pInfo.mDependencyTable[3];
 #if defined(ARCH_ARM_HAVE_NEON)
     const std::pair<const char *, const uint8_t *> &cache_libclcore_neon_dep =
-        pInfo.mDependencyTable[3];
+        pInfo.mDependencyTable[4];
 #endif
 
     // Check libbcc.so.
@@ -129,6 +135,17 @@
         return false;
     }
 
+    // Check libcompiler_rt.so.
+    if (::memcmp(cache_libcompiler_rt_dep.second, LibCompilerRTSHA1,
+                 SHA1_DIGEST_LENGTH) != 0) {
+        ALOGD("Cache %s is dirty due to %s has been updated.", pInputFilename,
+              LibCompilerRTPath);
+        PRINT_DEPENDENCY("current - ", LibCompilerRTPath, LibCompilerRTSHA1);
+        PRINT_DEPENDENCY("cache - ", cache_libcompiler_rt_dep.first,
+                                     cache_libcompiler_rt_dep.second);
+        return false;
+    }
+
     // Check libRS.so.
     if (::memcmp(cache_libRS_dep.second, LibRSSHA1, SHA1_DIGEST_LENGTH) != 0) {
         ALOGD("Cache %s is dirty due to %s has been updated.", pInputFilename,