commit 0f6b1d319d0d3605042345c4a6973e9c4e9161d7
author Stephen Hines <srhines@google.com> Thu May 03 12:29:33 2012 -0700
committer Stephen Hines <srhines@google.com> Thu May 03 15:36:10 2012 -0700
tree 0304261a00d882505a21232faf58dc0bd1f2de90
parent addca8fc02254162220f6d512c59c84d65f44d2d

Revert "Introduce RSInfo and its reader/extractor/writer."

This reverts commit 255cbc8a78131fd828de0fac3ff70baeaa2f032f.

Conflicts:

	lib/ExecutionEngine/RSInfoExtractor.cpp

Change-Id: I533398c25cd7fde2a76418101d29374b6e1d2b27

lib/ExecutionEngine/RSScript.cpp

diff --git a/lib/ExecutionEngine/RSScript.cpp b/lib/ExecutionEngine/RSScript.cpp
index 2ca97a5..d223eee 100644
--- a/lib/ExecutionEngine/RSScript.cpp
+++ b/lib/ExecutionEngine/RSScript.cpp
@@ -56,9 +56,10 @@
 
 namespace bcc {
 
-RSScript::SourceDependency::SourceDependency(const std::string &pSourceName,
+RSScript::SourceDependency::SourceDependency(MCO_ResourceType pSourceType,
+                                             const std::string &pSourceName,
                                              const uint8_t *pSHA1)
-  : mSourceName(pSourceName) {
+  : mSourceType(pSourceType), mSourceName(pSourceName) {
   ::memcpy(mSHA1, pSHA1, sizeof(mSHA1));
   return;
 }
@@ -105,10 +106,11 @@
   return true;
 }
 
-bool RSScript::addSourceDependency(const std::string &pSourceName,
+bool RSScript::addSourceDependency(MCO_ResourceType pSourceType,
+                                   const std::string &pSourceName,
                                    const uint8_t *pSHA1) {
   SourceDependency *source_dep =
-      new (std::nothrow) SourceDependency(pSourceName, pSHA1);
+      new (std::nothrow) SourceDependency(pSourceType, pSourceName, pSHA1);
   if (source_dep == NULL) {
     ALOGE("Out of memory when record dependency information of `%s'!",
           pSourceName.c_str());
@@ -261,12 +263,13 @@
   }
 
   // Dependencies
-  reader.addDependency(pathLibBCC_SHA1, sha1LibBCC_SHA1);
-  reader.addDependency(pathLibRS, sha1LibRS);
+  reader.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
+  reader.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
 
   for (unsigned i = 0; i < mSourceDependencies.size(); i++) {
     const SourceDependency *source_dep = mSourceDependencies[i];
-    reader.addDependency(source_dep->getSourceName(),
+    reader.addDependency(source_dep->getSourceType(),
+                         source_dep->getSourceName(),
                          source_dep->getSHA1Checksum());
   }
 
@@ -380,13 +383,14 @@
 
 #ifdef TARGET_BUILD
     // Dependencies
-    writer.addDependency(pathLibBCC_SHA1, sha1LibBCC_SHA1);
-    writer.addDependency(pathLibRS, sha1LibRS);
+    writer.addDependency(BCC_FILE_RESOURCE, pathLibBCC_SHA1, sha1LibBCC_SHA1);
+    writer.addDependency(BCC_FILE_RESOURCE, pathLibRS, sha1LibRS);
 #endif
 
     for (unsigned i = 0; i < mSourceDependencies.size(); i++) {
       const SourceDependency *source_dep = mSourceDependencies[i];
-      writer.addDependency(source_dep->getSourceName(),
+      writer.addDependency(source_dep->getSourceType(),
+                           source_dep->getSourceName(),
                            source_dep->getSHA1Checksum());
     }