commit bb9c69464112e825e2d66e1a5af5c57be939ff80
author Joseph Wen <josephwen@google.com> Thu Jul 07 23:17:56 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 23:17:56 2011 -0700
tree d88ed3ad42a4824f5e5548192a51e92c97c0a265
parent 7f3eaaac5a528d553201fac0298fee0d5eee3da8
parent 769190765f7a920ac7f30ff6d424f3ae850b1c3a

Merge "Add run-time hash check for libRS.so"

lib/ExecutionEngine/Compiler.cpp

diff --git a/lib/ExecutionEngine/Compiler.cpp b/lib/ExecutionEngine/Compiler.cpp
index 207d9bf..4afbbb4 100644
--- a/lib/ExecutionEngine/Compiler.cpp
+++ b/lib/ExecutionEngine/Compiler.cpp
@@ -248,6 +248,8 @@
 #if USE_CACHE
   // Read in SHA1 checksum of libbcc and libRS.
   readSHA1(sha1LibBCC_SHA1, sizeof(sha1LibBCC_SHA1), pathLibBCC_SHA1);
+
+  calcFileSHA1(sha1LibRS, pathLibRS);
 #endif
 
   GlobalInitialized = true;

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index 661c1b3..72d826c 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -225,8 +225,7 @@
 }
 
 int Script::internalLoadCache() {
-  // Temporarly disable the cache.
-  if (1 || getBooleanProp("debug.bcc.nocache")) {
+  if (getBooleanProp("debug.bcc.nocache")) {
     // Android system environment property disable the cache mechanism by
     // setting "debug.bcc.nocache".  So we will not load the cache file any
     // way.
@@ -274,6 +273,7 @@
 
   // Dependencies
   reader.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
+  reader.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
 
   for (size_t i = 0; i < 2; ++i) {
     if (mSourceList[i]) {
@@ -410,6 +410,7 @@
 #ifdef TARGET_BUILD
       // Dependencies
       writer.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
+      writer.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
 #endif
 
       for (size_t i = 0; i < 2; ++i) {

lib/ExecutionEngine/Sha1Helper.cpp

diff --git a/lib/ExecutionEngine/Sha1Helper.cpp b/lib/ExecutionEngine/Sha1Helper.cpp
index 4e9ee07..b30c7a5 100644
--- a/lib/ExecutionEngine/Sha1Helper.cpp
+++ b/lib/ExecutionEngine/Sha1Helper.cpp
@@ -32,6 +32,9 @@
 unsigned char sha1LibBCC_SHA1[20];
 char const *pathLibBCC_SHA1 = "/system/lib/libbcc.so.sha1";
 
+unsigned char sha1LibRS[20];
+char const *pathLibRS = "/system/lib/libRS.so";
+
 void calcSHA1(unsigned char *result, char const *data, size_t size) {
   SHA1_CTX hashContext;
 

lib/ExecutionEngine/Sha1Helper.h

diff --git a/lib/ExecutionEngine/Sha1Helper.h b/lib/ExecutionEngine/Sha1Helper.h
index 08e0cda..fe13b7a 100644
--- a/lib/ExecutionEngine/Sha1Helper.h
+++ b/lib/ExecutionEngine/Sha1Helper.h
@@ -25,6 +25,9 @@
   extern unsigned char sha1LibBCC_SHA1[20];
   extern char const *pathLibBCC_SHA1;
 
+  extern unsigned char sha1LibRS[20];
+  extern char const *pathLibRS;
+
   void calcSHA1(unsigned char *result, char const *data, size_t size);
 
   void calcFileSHA1(unsigned char *result, char const *filename);