commit 2ca6e576421e86e0128991b825c238f1d4221910
author Joseph Wen <josephwen@google.com> Fri Jun 24 14:12:23 2011 -0700
committer Joseph Wen <josephwen@google.com> Fri Jun 24 19:11:45 2011 -0700
tree f79bb7dadd556269a5d75d7c6472736c95ef50c2
parent d18a3df2628d26f65a1172ec2e3e0816731499f9

Fix the libbcc SHA1 checksum dependency

Calculate SHA1 checksum of libbcc.so and libRS.so at compile time.

Change-Id: Ief1c20e20d62f5d5bf0a62592e081d4a6d77dcd4

lib/ExecutionEngine/Script.cpp

diff --git a/lib/ExecutionEngine/Script.cpp b/lib/ExecutionEngine/Script.cpp
index 67e59f6..7aa3748 100644
--- a/lib/ExecutionEngine/Script.cpp
+++ b/lib/ExecutionEngine/Script.cpp
@@ -272,11 +272,7 @@
 #endif
 
   // Dependencies
-#if USE_LIBBCC_SHA1SUM
-  reader.addDependency(BCC_FILE_RESOURCE, pathLibBCC, sha1LibBCC);
-#endif
-
-  reader.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
+  reader.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
 
   for (size_t i = 0; i < 2; ++i) {
     if (mSourceList[i]) {
@@ -410,11 +406,10 @@
       CacheWriter writer;
 #endif
 
+#ifdef TARGET_BUILD
       // Dependencies
-#if USE_LIBBCC_SHA1SUM
-      writer.addDependency(BCC_FILE_RESOURCE, pathLibBCC, sha1LibBCC);
+      writer.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
 #endif
-      writer.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
 
       for (size_t i = 0; i < 2; ++i) {
         if (mSourceList[i]) {